Merge remote-tracking branch 'origin/div' into div

admin

2020-06-22 225f534c32ade11d6b3ac5fd6dcc731e056935ec

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

@@ -11,7 +11,7 @@
import com.yeshi.fanli.dto.HongBaoDTO;

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

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

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

import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.util.Constant;



@Component