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

yujian

2020-06-03 e74819e845de27735605c8116ee73768560e0fd9

 fanli/src/main/java/com/yeshi/fanli/controller/admin/shop/BanLiShopGoodsSetsPayAdminController.java

@@ -39,7 +39,7 @@
   @RequestMapping(value = "save")

   public void save(String callback, BanLiShopGoodsSetsPay record, HttpServletRequest request, PrintWriter out) {

      try {

         banLiShopGoodsSetPayService.addSetPay(record);

         banLiShopGoodsSetPayService.saveObject(record);

         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("保存成功"));

      } catch (BanLiShopGoodsSetPayException e) {

         JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));