From 5117fe2958a1bcec82e09fce01e49bb0bc2e0ba4 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 14 十二月 2022 15:11:09 +0800
Subject: [PATCH] update 同步 ruoyi 相关提交 * fix 修复 文件名包含特殊字符(+、-、*...)的文件无法下载问题 * update 优化 弹窗内容过多展示不全问题 * update echarts 4.9.0 => 5.4.0 * fix 修复 Vue3树形下拉不能默认选中 * update 优化 删除fuse无效选项maxPatternLength * fix 修复 代码生成图片/文件/单选时选择必填无法校验问题 * fix 修复 修改参数键名时 未移除过期缓存配置

---
 ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java |   26 ++++++++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
index eebbb4b..9f800be 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/UserConstants.java
@@ -23,9 +23,19 @@
     String EXCEPTION = "1";
 
     /**
+     * 鐢ㄦ埛姝e父鐘舵��
+     */
+    String USER_NORMAL = "0";
+
+    /**
      * 鐢ㄦ埛灏佺鐘舵��
      */
     String USER_DISABLE = "1";
+
+    /**
+     * 瑙掕壊姝e父鐘舵��
+     */
+    String ROLE_NORMAL = "0";
 
     /**
      * 瑙掕壊灏佺鐘舵��
@@ -61,6 +71,16 @@
      * 鏄惁鑿滃崟澶栭摼锛堝惁锛�
      */
     String NO_FRAME = "1";
+
+    /**
+     * 鑿滃崟姝e父鐘舵��
+     */
+    String MENU_NORMAL = "0";
+
+    /**
+     * 鑿滃崟鍋滅敤鐘舵��
+     */
+    String MENU_DISABLE = "1";
 
     /**
      * 鑿滃崟绫诲瀷锛堢洰褰曪級
@@ -109,4 +129,10 @@
      */
     int PASSWORD_MIN_LENGTH = 5;
     int PASSWORD_MAX_LENGTH = 20;
+
+    /**
+     * 绠$悊鍛業D
+     */
+    Long ADMIN_ID = 1L;
+
 }

--
Gitblit v1.9.3