From 0c569ab4b38d972213eeaf7e8965f33f8ec650fd Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 05 十一月 2024 11:19:19 +0800
Subject: [PATCH] 11.5

---
 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java |   29 ++++++++++++++++++++---------
 1 files changed, 20 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 157d44d..64bfb59 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,7 @@
      * 订单记录excel模板名称
      */
     public static final String EXCEL_ORDER_FILE_NAME = "订单记录";
-
-    /**
-     * 文件上传常量后缀
-     */
-    public static final String APK = "apk";
+    public static final String EXCEL_ORDER_FILE_NAME1 = "加盟商余额记录";
 
     /**
      * 用户编号生成前缀
@@ -248,9 +244,9 @@
     public static final Integer EIGHTEEN = 18;
 
     /**
-     * 数字18
+     * 数字8
      */
-    public static final Integer EIGHT = 18;
+    public static final Integer EIGHT = 8;
 
     /**
      * 数字 30
@@ -270,12 +266,27 @@
     /**
      * 数字 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 = "市";
 
     /**
      * 师傅端默认密码
@@ -290,6 +301,6 @@
     /**
      * 手机号码正则
      */
-    public static final String PHONE = "^1[34578]\\d{9}$";
+    public static final String PHONE = "^1[3456789]\\d{9}$";
 
 }

--
Gitblit v1.7.1