Merge branch 'master' into div

yujian

2019-07-11 21f2f635fefa3dcfd38f364c2a9d50c54360899c

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

@@ -113,11 +113,8 @@
         return joinPoint.proceed();

      } catch (Throwable e) {

         e.printStackTrace();

         try {

            LogHelper.errorDetailInfo(e);

         } catch (Exception e1) {

            e1.printStackTrace();

         }

         LogHelper.errorDetailInfo(e);



      } finally {

         if (!StringUtil.isNullOrEmpty(cacheKey)) {

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