Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro

2025-05-04 09:53:43 +08:00
parent 8176278086 163839926a
commit 3bcb9890e8
20 changed files with 404 additions and 99 deletions
--- a/yudao-dependencies/pom.xml
+++ b/yudao-dependencies/pom.xml
@@ -585,6 +585,13 @@
                <groupId>com.xkcoding.justauth</groupId>
                <artifactId>justauth-spring-boot-starter</artifactId>
                <version>${justauth-starter.version}</version>
+                <exclusions>
+                    <!-- 移除，避免和项目里的 hutool-all 冲突 -->
+                    <exclusion>
+                        <groupId>cn.hutool</groupId>
+                        <artifactId>hutool-core</artifactId>
+                    </exclusion>
+                </exclusions>
            </dependency>

            <dependency>