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

admin

2019-07-31 5046ecde3cd849511a337e25e13af7df7f1894bc

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