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

jyy

2021-04-09 4140a631bbcfa379b0b8206aa41d1b2453ffdb04

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

@@ -83,7 +83,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);
    }