-
Merge branch 'feature/2020-1104-混合支付' · dedb9331
# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-management/pom.xml # ordercenter-sdk/pom.xml
xiaoer.li@freemud.com committed