Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-30 a8ba157aefdf0922037c197daba6b859bc30bf22

 fanli/src/main/java/com/yeshi/fanli/util/factory/HongBaoFactory.java

@@ -7,8 +7,8 @@


import org.springframework.stereotype.Component;



import com.yeshi.fanli.dto.HongBao;

import com.yeshi.fanli.dto.HongBaoDTO;

import com.yeshi.fanli.entity.bus.user.HongBao;

import com.yeshi.fanli.entity.bus.user.Order;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;