Merge remote-tracking branch 'origin/div' into div

admin

2019-08-19 616608ec1005bff373bc380ecc3bf02a1063497c

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

   }



}