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

jyy

2021-05-22 3e85a137adb035e4808e95edf7017f7f204900d9

 zq-erp/src/main/java/com/matrix/system/score/action/ScoreRuleSettingAction.java

@@ -90,13 +90,11 @@
       String[] scjfArrayCode={
             ScoreSettingConstant.CASH_CONSUMPTION_SHOP,
             ScoreSettingConstant.RESERVATION_SERVICE_SHOP,
             ScoreSettingConstant.EVALUATUIN_ORDER_SHOP,
             ScoreSettingConstant.SIGN_SHOP};
             ScoreSettingConstant.EVALUATUIN_ORDER_SHOP};
       String[] scjfArrayName={
             "现金消费",
             "预约服务",
             "评价订单",
             "签到"};
             "评价订单"};
       List<ScoreRuleSettingsVo> scjfRuleSettingsVo =getRuleSettingsVo(scjfArrayCode,scjfArrayName,companyId);
       result.putInMap("scjf", scjfRuleSettingsVo);
       return result;