From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0
---
zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java b/zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java
index 82a26fc..5f5acd8 100644
--- a/zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java
+++ b/zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java
@@ -110,19 +110,6 @@
public static final String SAFEPATH = "/su";
public static final String TOKEN_KEY = "token";
- /**
- * 保存在cookie 中的token
- */
- public static final String USER_TOKEN_COOKIE = "token";
- public static final String COOKIE_TIME_OUT = "cookie_time_out";
- /**
- * nginx访问地址
- */
- public static final String NGINX_URL = "static_resource_url";
- /**
- * 存储路径
- */
- public static final String FILES_TORAGE_PATH = "file_storage_path";
/**
* 过滤特殊字符
@@ -592,6 +579,11 @@
public static final String OPEN_SMS_NOTICE = "OPEN_SMS_NOTICE";
/**
+ * 服务单自动配料
+ */
+ public static final String OPEN_SERVICE_ORDER_AUTO_BATCHING = "OPEN_SERVICE_ORDER_AUTO_BATCHING";
+
+ /**
* 赠送金额购买产品算赠送购买
*/
public static final String SHOP_MANAGE_GIFTISFREE = "shopManageGiftisfree";
@@ -600,7 +592,6 @@
* 钉钉通知token
*/
public static final String WX_ORDER_NOTICE_DINGDING_TOKEN = "wxOrderNoticeDingdingToken";
-
--
Gitblit v1.9.1