OrderApplication.java
6.32 KB
-
Merge branch 'feature/xukang_20210907_麦咖啡订单数据推送到麦当劳' into qa · d7b53749
# Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/thirdparty/PaymentNewClient.java
徐康 committed