-
# 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
-
Merge pull request !313 from 石溪/master
-
Merge pull request !287 from halfninety/master
-
https://gitee.com/zhijiantianya/ruoyi-vue-pro/issues/I5WP5M
-
Signed-off-by: xingyu <xingyu4j@vip.qq.com>
-
# Conflicts: # yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/file/FileServiceImpl.java