Merge remote-tracking branch 'origin/master'

JiangYouYao

2022-03-15 bbc374ae6a80b111bb9d3056a065d8c5f6cd143e

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