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

# Conflicts:
#	yudao-dependencies/pom.xml
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/job/JobServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImpl.java
#	yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/mail/MailSendServiceImplTest.java

2024-04-22 19:02:13 +08:00

..

yudao-module-infra-api

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

2024-04-22 19:02:13 +08:00

yudao-module-infra-biz

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

2024-04-22 19:02:13 +08:00

pom.xml

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

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