From 393d296e43f0e5f11e524cab5446bcd3eee94e89 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 12 Jun 2021 17:47:38 +0800
Subject: [PATCH] 新增赠送项目是否计算消耗控制

---
 zq-erp/src/main/java/com/matrix/system/constance/Dictionary.java |   15 ++++++++++-----
 1 files changed, 10 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 98b61a9..199d54d 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,10 +55,7 @@
 	 * 支付方式-现金支付
 	 */
 	String PAY_TYPE_MOENY = "现金";
-	/**
-	 * 支付方式-现金支付
-	 */
-	String PAY_TYPE_MOENY_CARD = "会员卡";
+
 	/**
 	 * 支付方式-卡支付
 	 */
@@ -567,5 +564,13 @@
 
 	String ACHIEVE_TYPE_CASH = "现金业绩";
 	String ACHIEVE_TYPE_CARD = "划扣业绩";
-	
+
+    String SEX_MAN ="男";
+    String SEX_WOMAN ="女";
+
+    String[] COLORS = { "#57c5d2", "#e3565e", "#2f343a", "#4d98db", "#4fbc9d", "#be9d4c"};
+
+    String SERVICE_OVER_BEGIN_END = "SERVICE_OVER_BEGIN_END";
+    String SALE_MAN_IS_CONSUME_ACHIEVE = "SALE_MAN_IS_CONSUME_ACHIEVE";
+    String ZS_CONSUME_ACHIEVE = "ZS_CONSUME_ACHIEVE";
 }

--
Gitblit v1.9.1