Merge branch 'div_develop' into master_develop

yujian

2019-04-29 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf

 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);

            }

            

            // 接收券