From 556aca9f39838c5a7e72ac86ac64f42f923c5a2a Mon Sep 17 00:00:00 2001
From: jiangyouyao <jiangyouyao>
Date: Wed, 06 Apr 2022 14:49:36 +0800
Subject: [PATCH] Merge branch 'develop'
---
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