Merge branch 'ty_fix' into alpha

Helius

2021-11-08 ad3f115b29e3c33b32bd38855bdc5b9f2de381b1

 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;