Merge branch 'mater-1.6.0' into div

admin

2019-08-22 a9b7fab63c4345a6b183bffdab1bb0884f4202b5

 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");

   }



}