Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

rk

6 天以前 8c4dfb07d551ceb372887ff8f22bd1f574d0347b

 server/visits/dmvisit_admin/src/main/java/com/doumee/config/shiro/ShiroCache.java

@@ -45,7 +45,7 @@

    @Override
    public Serializable get(Object key) throws CacheException {
        if (key == null) {
        if (key == null || getKey(key) == null) {
            return null;
        }
        return redisTemplate.opsForValue().get(getKey(key));