Merge branch 'score_shop' into api_score_meger

935090232@qq.com

2022-02-18 4506cc81e35921635299078ca24f7dfc92408e1c

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

@@ -126,8 +126,6 @@
      newSetting11.setCategory("店务配置");
      newSettings.add(newSetting11);



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