From 06a7debe678e7ae30f39c61a7f71a926d52d1ae7 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期二, 13 十一月 2018 10:26:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/aspect/LoginAspect.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/aspect/LoginAspect.java b/fanli/src/main/java/com/yeshi/fanli/aspect/LoginAspect.java
index eb5ef33..73ab64a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/aspect/LoginAspect.java
+++ b/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

--
Gitblit v1.8.0