-
Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into qa · c43493b8# Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
刘鹏飞 committed