From 4ad105d87c06b9d7ded694451ea752cbbad9e129 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Sat, 12 Jun 2021 17:47:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

---
 zq-erp/src/main/java/com/matrix/system/constance/Dictionary.java |    1 +
 1 files changed, 1 insertions(+), 0 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 5e5bbcc..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
@@ -572,4 +572,5 @@
 
     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