-
Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' · fd7cfdf0# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-application-service/pom.xml # ordercenter-sdk/pom.xml # shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
徐康 committed