From d90ac211d9168c1ce8d390838f367a0db00afb52 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 03 六月 2025 14:37:51 +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 | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 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 26d7a71..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,11 +146,8 @@
* 订单记录excel模板名称
*/
public static final String EXCEL_ORDER_FILE_NAME = "订单记录";
-
- /**
- * 文件上传常量后缀
- */
- public static final String APK = "apk";
+ public static final String EXCEL_ORDER_FILE_NAME1 = "加盟商余额记录";
+ public static final String EXCEL_ORDER_FILE_NAME2 = "加盟商扣款记录";
/**
* 用户编号生成前缀
@@ -248,9 +245,14 @@
public static final Integer EIGHTEEN = 18;
/**
- * 数字18
+ * 数字8
*/
- public static final Integer EIGHT = 18;
+ public static final Integer EIGHT = 8;
+
+ /**
+ * 数字 30
+ */
+ public static final Integer THIRTY = 30;
/**
* 数字100
@@ -258,14 +260,34 @@
public static final Integer ONE_HUNDRED = 100;
/**
+ * 数字 365
+ */
+ public static final Integer YEAR_DAY = 365;
+
+ /**
* 数字 3000
*/
- public static final Integer THREE_THOUSAND = 3000;
+ public static final Integer THREE_THOUSAND = 2000;
/**
* 师傅端默认用户ID前缀
*/
public static final String DEFAULT_USER_NUMBER_PRE = "用户";
+
+ /**
+ * 师傅端默认用户ID前缀
+ */
+ public static final String SUBSIDY_MONEY = "¥";
+
+ /**
+ * 师傅端默认用户ID前缀
+ */
+ public static final String PROVINCE = "省";
+
+ /**
+ * 师傅端默认用户ID前缀
+ */
+ public static final String MARKET = "市";
/**
* 师傅端默认密码
@@ -280,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