YunaiV 92632c046c Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp ...

# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceImpl.java
#	yudao-ui-admin/src/views/mall/trade/order/index.vue

2022-12-23 19:12:45 +08:00

..

yudao-module-pay-api

trade：完成支付成功后的回调，更新订单为已支付

2022-11-26 18:40:51 +08:00

yudao-module-pay-biz

Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp

2022-12-23 19:12:45 +08:00

pom.xml

1. 【修复】单元测试报错

2022-04-22 00:07:54 +08:00