Merge remote-tracking branch 'origin/master'

admin

2019-06-27 ab9e60fa9a8e43d797446730a5dc9ebfb6b3f4e6

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