From b687aa0f371e12d4ec1813f18a4f889e8f825f67 Mon Sep 17 00:00:00 2001
From: jyy <jyy>
Date: Fri, 03 Sep 2021 14:19:08 +0800
Subject: [PATCH] Merge branch 'score_shop' into api_score_meger

---
 zq-erp/src/main/java/com/matrix/system/constance/Dictionary.java |    3 ++-
 1 files changed, 2 insertions(+), 1 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..37951a2 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
@@ -552,7 +552,7 @@
 
 	// 服务器文件上传配置
 	String SAVE_PATH = "/mnt/hive/static/uploadeFile/";
-	String SAVE_URL = "http://resource.hive.jyymatrix.cc/uploadeFile/";
+	String SAVE_URL = "http://filehive2.jyymatrix.cc/uploadeFile/";
 
 
 	// 积分规则编号
@@ -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