Merge branch 'master' into div

yujian

2019-07-16 a503900f405a39f3aa30a8663ca661cf3c6b55ea

 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;