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

admin

2020-05-12 99bc8d6f16357f7c01634b316903058740e96e93

 fanli/src/main/java/com/yeshi/fanli/service/manger/user/UserTeamStatisticManager.java

@@ -12,7 +12,7 @@


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

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

import com.yeshi.fanli.entity.bus.user.vip.TeamDailyRecord;

import com.yeshi.fanli.entity.bus.user.invite.TeamDailyRecord;

import com.yeshi.fanli.entity.bus.user.vip.UserLevelEnum;

import com.yeshi.fanli.entity.bus.user.vip.UserVIPPreInfo;

import com.yeshi.fanli.exception.user.TeamDailyRecordException;