Merge branch 'master' into div

yujian

2019-07-11 21f2f635fefa3dcfd38f364c2a9d50c54360899c

 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;