Merge remote-tracking branch 'origin/master'

admin

2019-04-22 f877016b46d8b76ef445a4ac337f8eae66b882be

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

@@ -72,7 +72,7 @@
                  return;

               }

               // 加入缓存 20分钟

               redisManager.cacheCommonString("activeUid_" + uuid, uuid.toString(), 60 * 20);

               redisManager.cacheCommonString(key, uuid.toString(), 60 * 20);

            }

            

            // 接收券