Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-10-09 b44f60ae27bbe0b7aec29414c629747b7755e964

 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;