Merge branch 'mater-1.6.0' into div

admin

2019-08-13 25b7e040153e96fd7c9f649e9b0de8932e1a2a00

 fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java

@@ -145,4 +145,9 @@
      out.print("success");

   }



   @RequestMapping(value = "vip")

   public void VIP(PrintWriter out) {

      out.print("success");

   }



}