Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2021-10-21 487e48afd7acf4a2ddddd02f2ec1db7fa1d91e99

 zq-erp/src/test/java/com/matrix/ParameterSettingsTool.java

@@ -90,6 +90,21 @@
      newSetting6.setCategory("店务配置");
      newSettings.add(newSetting6);

      ParameterSettings newSetting7=new ParameterSettings();
      newSetting7.setCode(AppConstance.SHOP_MANAGE_GIFTISFREE);
      newSetting7.setName("赠送金额购买产品算赠送购买");
      newSetting7.setType(1);
      newSetting7.setCategory("店务配置");
      newSettings.add(newSetting7);


      ParameterSettings newSetting8=new ParameterSettings();
      newSetting8.setCode(AppConstance.SHOP_MANAGE_ABLE_CANCEL_DFK_ORDER);
      newSetting8.setName("门店是否只能取消待付款订单,服务单");
      newSetting8.setType(1);
      newSetting8.setCategory("店务配置");
      newSettings.add(newSetting8);


      for (ParameterSettings newSetting : newSettings) {
         List<ParameterSettings> parameterSettings = parameterSettingsDao.selectByModel(newSetting);