-
# Conflicts: # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/kefu/AppKeFuMessageController.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/convert/combination/CombinationActivityConvert.java
-
# Conflicts: # yudao-server/src/main/resources/application-local.yaml
-
* feat[yudao-module-pay]: 更新新增和更新支付应用时校验逻辑 * fix[yudao-module-trade]: 为支付应用标识提供缺省值 * fix[yudao-module-pay]: appKey注释应用编码更新为应用标识 * feat[yudao-module-pay]: 为支付应用新增支付编码属性
-
Merge pull request !1011 from 芋道源码/develop
-
Merge pull request !1006 from 芋道源码/master-jdk21-ai
-
# Conflicts: # yudao-dependencies/pom.xml # yudao-server/src/main/resources/application-local.yaml
-
# Conflicts: # yudao-server/src/main/resources/application-local.yaml