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

admin

2020-03-12 7a40d9ca41da29aee9464f545e10b452a1922c32

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

@@ -148,7 +148,10 @@
         return joinPoint.proceed();

      } catch (Throwable e) {

         e.printStackTrace();

         LogHelper.errorDetailInfo(e);

         if (!Constant.IS_TEST)

            LogHelper.errorDetailInfo(e);

         else

            throw e;

      } finally {

      }

      return null;