-
Merge pull request !1060 from puhui999/develop
-
Merge pull request !1057 from puhui999/develop
-
Merge pull request !1050 from puhui999/develop
-
Merge pull request !1047 from puhui999/develop
-
Merge pull request !1045 from puhui999/develop
-
# Conflicts: # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsCallbackController.java
-
* feat[yudao-module-pay]: 更新新增和更新支付应用时校验逻辑 * fix[yudao-module-trade]: 为支付应用标识提供缺省值 * fix[yudao-module-pay]: appKey注释应用编码更新为应用标识 * feat[yudao-module-pay]: 为支付应用新增支付编码属性
-
Merge pull request !1044 from 芋道源码/develop
