readme.md
10.3 KB
-
Merge branch 'feature/20201124_xukang_麦咖啡p3v3' into qa · bc62bd0d
# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-application-service/pom.xml # order-management/pom.xml # order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java # ordercenter-sdk/pom.xml
徐康 committed