From bbe0a2fd03063316e50cf141986bda984599bbda Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:41:42 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 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 fcd90d7..87a5736 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
@@ -521,7 +521,7 @@
/**
* 免免邮金额
*/
- public static final String FREE_PACKAGE_PRICE = "FREE_PACKAGE_PRICE";
+ public static final String FREE_PACKAGE_PRICE = "FREE_PACKAGE_PRICE";
/**
@@ -578,8 +578,42 @@
*/
public static final String SHOP_MANAGE_JJCPAS_CONSUME = "shopManageJjcpasConsume";
+ /**
+ * 门店是否只能取消待付款订单,服务单
+ */
+ public static final String SHOP_MANAGE_ABLE_CANCEL_DFK_ORDER = "shopManageAbleCancelDfkOrder";
+ /**
+ * 服务记录跟进模板
+ */
+ public static final String SERVICE_FLOW_TEMPLATE = "SERVICE_FLOW_TEMPLATE";
+ /**
+ * 开启短信提醒
+ */
+ 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";
+
+ /**
+ * 钉钉通知token
+ */
+ public static final String WX_ORDER_NOTICE_DINGDING_TOKEN = "wxOrderNoticeDingdingToken";
+
+ /**
+ * 管理端小程序appid
+ */
+ public static final String MINI_PROGRAM_MANAGER_APP_ID = "xcx_manager_appid";
+ /**
+ * 管理端小程序secret
+ */
+ public static final String MINI_PROGRAM_MANAGER_SECRET = "xcx_manager_secret";
--
Gitblit v1.9.1