Merge remote-tracking branch 'upstream/master' into dev_lcw

# Conflicts: # pom.xml # ruoyi-common/ruoyi-common-core/pom.xml # ruoyi-common/ruoyi-common-swagger/pom.xml # ruoyi-gateway/pom.xml # ruoyi-modules/ruoyi-file/pom.xml # ruoyi-modules/ruoyi-gen/pom.xml # ruoyi-modules/ruoyi-job/pom.xml # ruoyi-modules/ruoyi-system/pom.xml # sql/ry_config_20240902.sql
2026-01-29 04:51:58 +08:00 · 2024-09-23 17:25:26 +08:00
parent f622222943 3dca02b306
commit 3ec8590120
31 changed files with 340 additions and 784 deletions
--- a/ruoyi-common/ruoyi-common-core/pom.xml
+++ b/ruoyi-common/ruoyi-common-core/pom.xml
@@ -107,12 +107,6 @@
            <artifactId>javax.servlet-api</artifactId>
        </dependency>

-        <!-- Swagger -->
-        <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-        </dependency>
-
    </dependencies>

 </project>
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java
@@ -21,6 +21,9 @@ public class UserConstants
    /** 用户封禁状态 */
    public static final String USER_DISABLE = "1";

+    /** 角色正常状态 */
+    public static final String ROLE_NORMAL = "0";
+
    /** 角色封禁状态 */
    public static final String ROLE_DISABLE = "1";