From d4c997972509c2da06b1128086b1735597823d3f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 30 Nov 2021 17:19:20 +0800
Subject: [PATCH] Merge branch 'ty_fix' of http://120.27.238.55:7000/r/beauty-erp into ty_fix
---
zq-erp/src/main/java/com/matrix/system/common/constance/AppConstance.java | 14 +++++++++++++-
1 files changed, 13 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 82a26fc..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
@@ -592,6 +592,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";
@@ -601,7 +606,14 @@
*/
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