ShiShiYiBan/yudao-server
YunaiV 5b1287ad41 Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogServiceImpl.java
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/RoleServiceImpl.java
2024-06-04 21:20:26 +08:00
..
src Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/ruoyi-vue-pro 2024-06-04 21:20:26 +08:00
Dockerfile ⬇️ 保持 JDK8 + Spring Boot 2.7.18 持续维护 2023-12-08 22:17:52 +08:00
pom.xml 同步 develop 最新代码 2024-04-12 19:17:49 +08:00