-
Merge branch 'feature/1.9.34-预支付失败记录消息到reason-肖家炜' into qa · a8ac5930# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # call-back-service/pom.xml # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/controller/OrderController.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md
vega committed