Merge remote-tracking branch 'origin/master'

kaiyu

2020-11-18 8dc1a393928b0195bf0b5a6d6f8daec6e4a043b1

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

      }