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

935090232@qq.com

2021-11-30 6cf7e063aa0c486c81beb6ed89386b501ad879f1

 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)){