Merge branch 'mater-1.6.0' into div

admin

2019-08-26 1d1c321cdb8905d8c89c26637d36b975c4b12742

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

@@ -23,7 +23,6 @@
import com.yeshi.fanli.log.LogHelper;

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

import com.yeshi.fanli.util.VersionUtil;

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

import com.yeshi.fanli.util.annotation.integral.IntegralGetVersionLimit;



@Component