From 2a7a159b136805612e241e4e8e24affedfc23cc2 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sat, 20 Nov 2021 21:07:43 +0800
Subject: [PATCH] Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
---
zq-erp/src/main/java/com/matrix/system/score/action/ScoreRuleSettingAction.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreRuleSettingAction.java b/zq-erp/src/main/java/com/matrix/system/score/action/ScoreRuleSettingAction.java
index ef1b141..25a2ee1 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/action/ScoreRuleSettingAction.java
+++ b/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;
--
Gitblit v1.9.1