Merge branch 'alpha' of http://120.27.238.55:7000/r/beauty-erp into alpha

wzy

2021-11-28 c76890a550f386a52a7111e3d87242ab35af5b41

 zq-erp/src/main/java/com/matrix/system/common/service/impl/InitBusParameterSettingService.java

@@ -37,7 +37,6 @@
        ruleSettings.add(addScoreRuleSetting(ScoreSettingConstant.CASH_CONSUMPTION_SHOP, companyId));

        ruleSettings.add(addScoreRuleSetting(ScoreSettingConstant.RESERVATION_SERVICE_SHOP, companyId));

        ruleSettings.add(addScoreRuleSetting(ScoreSettingConstant.EVALUATUIN_ORDER_SHOP, companyId));

        ruleSettings.add(addScoreRuleSetting(ScoreSettingConstant.SIGN_SHOP, companyId));



        busParameterSettingsDao.batchInsert(ruleSettings);

    }