readme.md
6.49 KB
-
Merge branch '调用门店获取最新配送费-周晓航' into qa · 1631a8e2# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/service/coupon/impl/PlatformCouponRelationServiceImpl.java # ordercenter-sdk/pom.xml # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
周晓航 committed