-
Merge branch 'feature/20210603-v2.0.33-订单获取预计送达时间ID1030763-周晓航' · 1f6e2d37
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java # order-application-service/src/main/java/cn/freemud/entities/dto/delivery/CallbackUrlRequestDto.java
周晓航 committed