-
Merge remote-tracking branch 'remotes/origin/feature-2020/2/10-1.9.15-免配送费二期-海波' into develop · c8837bbd
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-shoppingcart-sdk/pom.xml # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md # shopping-cart-application-service/pom.xml
姜海波 committed
Name |
Last commit
|
Last update |
---|---|---|
.. | ||
main | Loading commit data... | |
test/java/cn.freemud | Loading commit data... |