-
Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' · 311b45a5
# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/adapter/DeliveryAdapter.java # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
徐康 committed