Merge remote-tracking branch 'origin/master'

Administrator

2018-11-29 8e86853359ec5c1c5586cfff8beda83eb1b6be7d

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

@@ -14,12 +14,12 @@
import org.springframework.stereotype.Component;

import org.springframework.web.context.request.RequestContextHolder;

import org.springframework.web.context.request.ServletRequestAttributes;

import org.yeshi.utils.JsonUtil;



import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

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

import org.yeshi.utils.JsonUtil;



@Component

@Aspect