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

# Conflicts: # yudao-dependencies/pom.xml # yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/web/core/handler/GlobalExceptionHandler.java
2024-04-10 20:58:35 +08:00
parent 3dbb714d12 2e03dcba69
commit cc9b2e86b6
18 changed files with 1 additions and 90 deletions
--- a/yudao-module-member/yudao-module-member-biz/src/test/resources/application-unit-test.yaml
+++ b/yudao-module-member/yudao-module-member-biz/src/test/resources/application-unit-test.yaml
@@ -37,8 +37,6 @@ mybatis:

 # Lock4j 配置项（单元测试，禁用 Lock4j）

-# Resilience4j 配置项
-
 --- #################### 监控相关配置 ####################

 --- #################### 芋道相关配置 ####################