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

admin

2019-11-05 e021e32a6ff0ec216f69c24f7ea929798bdce4c5

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

@@ -150,4 +150,10 @@
      out.print("success");

   }



	
   @RequestMapping(value = "banlishop/pay")

   public void banLiShopPay(PrintWriter out) {

      out.print("success");

   }

	
}