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

admin

2019-09-09 61c21f17b1ad94e4b0018c7e385195bab21b0b5c

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

@@ -107,12 +107,8 @@
      try {

         return joinPoint.proceed();

      } catch (Throwable e) {

         e.printStackTrace();

         try {

            LogHelper.errorDetailInfo(e);

         } catch (Exception e1) {

            e1.printStackTrace();

         }

			
      } finally {

         if (!StringUtil.isNullOrEmpty(cacheKey)) {

            Cache cache = cacheManager.getCache("rsCache");