-
Merge remote-tracking branch 'remotes/origin/feature/coco-payGift-刘鹏飞' into develop · f9bc24fa# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java # order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # ordercenter-sdk/pom.xml # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
刘鹏飞 committed