Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-11-18 d0fe2eb9cefc7e3bfdddc5fa66633057c42697fc

 src/main/java/com/moral/common/aop/ControllerAOP.java

@@ -33,7 +33,7 @@


      try {

         result = pjp.proceed();

         log.info(pjp.getSignature() + "use time:" + (System.currentTimeMillis() - startTime));

         // log.info(pjp.getSignature() + "use time:" + (System.currentTimeMillis() - startTime));

      } catch (Throwable e) {

         result = handlerException(pjp, e);

      }