From 26ffb618e472c3681f17b8b1b1a19ea55383928c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 12 Mar 2021 18:28: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/constance/Dictionary.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/constance/Dictionary.java b/zq-erp/src/main/java/com/matrix/system/constance/Dictionary.java
index 262e6e7..d2e2e47 100644
--- a/zq-erp/src/main/java/com/matrix/system/constance/Dictionary.java
+++ b/zq-erp/src/main/java/com/matrix/system/constance/Dictionary.java
@@ -55,14 +55,17 @@
* 支付方式-现金支付
*/
String PAY_TYPE_MOENY = "现金";
- /**
- * 支付方式-现金支付
- */
- String PAY_TYPE_MOENY_CARD = "会员卡";
+
/**
* 支付方式-卡支付
*/
String PAY_TYPE_CARD = "划扣";
+
+
+ /**
+ * 服务单状态-待确认
+ */
+ String SERVICE_STATU_DQR = "待确认";
/**
* 服务单状态-待预约
*/
@@ -561,5 +564,9 @@
String ACHIEVE_TYPE_CASH = "现金业绩";
String ACHIEVE_TYPE_CARD = "划扣业绩";
-
+
+ String SEX_MAN ="男";
+ String SEX_WOMAN ="女";
+
+ String[] COLORS = { "#57c5d2", "#e3565e", "#2f343a", "#4d98db", "#4fbc9d", "#be9d4c"};
}
--
Gitblit v1.9.1