-
Merge remote-tracking branch 'remotes/origin/feature/repeatCreateOrder-刘鹏飞' into develop · e80df8e2# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # assortment-shoppingcart-sdk/readme.md # order-application-service/pom.xml # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
刘鹏飞 committed