Merge remote-tracking branch 'origin/master'

yujian

2019-07-11 8a7a7e79b63d91d1865bdf2ec38d4e99d2670d69

 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;