readme.md
9.84 KB
-
Merge branch 'feature/20201223-订单详情查询接口增加配送类型字段-张志恒' into develop · 891436d5# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/service/Orderservice.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md
zhiheng.zhang committed