From 3044a637a15e09d50ad733fd482c6e64e90df2f9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 25 六月 2025 17:46:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
index 2915276..9175cf2 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
@@ -146,6 +146,8 @@
* 订单记录excel模板名称
*/
public static final String EXCEL_ORDER_FILE_NAME = "订单记录";
+ public static final String EXCEL_ORDER_FILE_NAME1 = "加盟商余额记录";
+ public static final String EXCEL_ORDER_FILE_NAME2 = "加盟商扣款记录";
/**
* 用户编号生成前缀
@@ -265,7 +267,7 @@
/**
* 数字 3000
*/
- public static final Integer THREE_THOUSAND = 3000;
+ public static final Integer THREE_THOUSAND = 2000;
/**
* 师傅端默认用户ID前缀
@@ -300,6 +302,6 @@
/**
* 手机号码正则
*/
- public static final String PHONE = "^1[34578]\\d{9}$";
+ public static final String PHONE = "^1[3456789]\\d{9}$";
}
--
Gitblit v1.7.1