-
Merge pull request !1069 from puhui999/develop
-
Merge pull request !19 from 小新/master-jdk21-ai
-
Merge pull request !1056 from 卢越/master-jdk17
-
# Conflicts: # yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/SmsClientTests.java
-
# Conflicts: # yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/http/HttpUtils.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsCallbackController.java # yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/SmsClientTests.java
-
Merge pull request !1059 from 杨宇庆/N/A
-
Merge pull request !1064 from puhui999/develop
-
Merge pull request !1060 from puhui999/develop