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

# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java

2025-04-30 15:02:49 +08:00

..

yudao-module-system-api

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

2025-04-30 00:11:24 +08:00

yudao-module-system-biz

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

2025-04-30 15:02:49 +08:00

pom.xml

1. 【修复】单元测试报错

2022-04-22 00:07:54 +08:00