-
# Conflicts: # yudao-server/src/main/resources/application-local.yaml
-
# 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
-
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
-
Merge pull request !1017 from 尹先生/master-jdk17
-
Signed-off-by: 常柯柯 <88455621@qq.com>
