Merge branch 'score_shop' into api_score_meger

jyy

2021-08-06 5f95864f021254fba9881cf0c738dc49d1f84b71

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

@@ -90,6 +90,13 @@
      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);


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