-
# Conflicts: # yudao-module-mall/yudao-module-trade-api/src/main/java/cn/iocoder/yudao/module/trade/enums/MessageTemplateConstants.java # yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/enums/MessageTemplateConstants.java
-
Merge pull request !1019 from puhui999/develop
-
Merge pull request !1018 from puhui999/develop
-
Merge pull request !1014 from puhui999/develop
-
【依赖】flatten-maven-plugin from 1.5.0 to 1.6.0
-
Merge pull request !1011 from 芋道源码/develop
-
Merge pull request !1013 from 芋道源码/master-jdk21-ai