Merge branch 'wheng' of wuheng/eas-system into master

service/src/main/java/com/koobietech/eas/service/impl/LoginRedisServiceImpl.java

@@ -6,6 +6,7 @@ import com.koobietech.eas.common.service.RedisService;
 import com.koobietech.eas.dao.adminLoginPojo.UserDetail;
 import com.koobietech.eas.service.LoginRedisService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -14,6 +15,7 @@ import javax.annotation.Resource;
 public class LoginRedisServiceImpl implements LoginRedisService {
 
     @Autowired
+    @Qualifier("CommonRedisTemplate")
     private RedisService redisService;