-
Merge branch 'feature/20200727_麦咖啡p1v2支付券码路由' into feature-2020/9/6-fabu-huiyang · d6d27a4d# Conflicts: # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/OrderProductAddInfoDto.java # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/OrderApplication.java # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java # order-application-service/src/main/java/cn/freemud/service/thirdparty/DeliveryFeiginClient.java # order-management/src/main/java/cn/freemud/management/thirdparty/CouponOfflineMCCafeClient.java
徐康 committed
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| main/java/com/freemud/application/sdk/api/ordercenter | Loading commit data... | |
| test | Loading commit data... |