-
Merge remote-tracking branch 'origin/feature/2.0.16-小程序外卖配送逻辑调整' · 15f848cf
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java # order-application-service/pom.xml # order-management/pom.xml
xiaoer.li@freemud.com committed