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

admin

2019-11-26 e97065519838a1ebbee870eefae6eae9f5d91647

 fanli/src/main/java/com/yeshi/fanli/job/UpdateThreeSaleJob.java

@@ -9,9 +9,9 @@
import org.springframework.stereotype.Component;



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

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

import com.yeshi.fanli.service.inter.msg.UserInviteMsgNotificationService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.user.invite.UserInviteMsgNotificationService;

import com.yeshi.fanli.util.Constant;



@Component