Merge branch 'master' into div

yujian

2019-07-12 d222232204b5ba3d3039ae8689dad743ea06723f

 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;