From a966dafb8877552267a94fe8c544c5ea72cf5650 Mon Sep 17 00:00:00 2001 From: huliguo <2023611923@qq.com> Date: 星期一, 16 六月 2025 09:44:40 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0 --- ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/SecurityConstant.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/SecurityConstant.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/SecurityConstant.java index 9381a1c..5f7ac74 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/SecurityConstant.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/SecurityConstant.java @@ -52,6 +52,11 @@ String AUTO_CANCEL_ORDER_TIME = "AUTO_CANCEL_ORDER_TIME"; /** + * 商户统一分成 + */ + String SHOP_COMMON_PROPORTION = "SHOP_COMMON_PROPORTION"; + + /** * 自动取消订单时间 */ String PAY_MONEY_INTEGRAL = "PAY_MONEY_INTEGRAL"; -- Gitblit v1.7.1