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

admin

2019-09-27 6b75391e97aa770e12965ec6e542856df79e6de0

 fanli/src/main/java/com/yeshi/fanli/aspect/ActiveUserAspect.java

@@ -19,9 +19,9 @@
import org.yeshi.utils.NumberUtil;



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

import com.yeshi.fanli.service.inter.integral.IntegralGetService;

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

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

import com.yeshi.fanli.service.inter.user.integral.IntegralGetService;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.ThreadUtil;

import com.yeshi.fanli.util.annotation.UserActive;