Merge branch 'mater-1.6.0' into div

admin

2019-08-13 25b7e040153e96fd7c9f649e9b0de8932e1a2a00

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

@@ -41,7 +41,7 @@
      KEY = Constant.systemCommonConfig.getSignKey();

   }



//   @Around(EDP)

   @Around(EDP)

   public Object testAround(ProceedingJoinPoint joinPoint) throws IOException {

      Object[] args = joinPoint.getArgs();

      PrintWriter out = null;