-
# 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 !1011 from 芋道源码/develop
-
Merge pull request !997 from scholarli/develop
-
Merge pull request !1006 from 芋道源码/master-jdk21-ai
-
Signed-off-by: g_l <glwxx0719@163.com>
