-
Merge branch 'feature/20200915_麦咖啡p2v3活动入机增加TENDERID字段' into develop · 2e6a711e# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java # shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartInfoRequestVo.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/AssortmentSdkService.java
徐康 committed