pom.xml
16.3 KB
-
Merge branch '20201127_coco配送进程' into master_back · 5cd6ace1
# Conflicts: # order-application-service/src/main/java/cn/freemud/service/Orderservice.java # order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java
邓杰 committed