Merge branch 'master' into div

yujian

2019-07-12 e2741d692b5d2e382ae3159a131d54a9ca75aa6f

 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;