Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

kaiyu

2020-12-02 3aa2f5aa4c7963e7bcfbc0d710c286c826338df9

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

      }