Merge branch 'mater-1.6.0' into div

admin

2019-08-13 25b7e040153e96fd7c9f649e9b0de8932e1a2a00

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

@@ -31,11 +31,9 @@
      try {

         obj = joinPoint.proceed(args);

      } catch (Throwable e) {

         try {

			
            LogHelper.errorDetailInfo(e, getHttpServletParams(request), request.getRequestURI().toString());

         } catch (Exception e1) {

            e1.printStackTrace();

         }

			
      }



      return obj;