-
Merge branch 'KA-支持门店手动创建运单，通知骑手到店取餐20210915-zxh' into qa · 6df167bc# Conflicts: # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java # order-application-service/src/main/java/cn/freemud/adapter/CreateOrderAdapter.java # order-application-service/src/main/java/cn/freemud/entities/dto/pay/OrderPayResponse.java # order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderCommonService.java # order-application-service/src/main/java/cn/freemud/service/impl/PointsMallOrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/SellCouponOrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/universal/UniversalOrderService.java # order-management/src/main/java/cn/freemud/management/adapter/DeliverySdkAdapter.java # order-management/src/main/java/cn/freemud/management/service/impl/SaasOrderMangerServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/adapter/ActivityAdapter.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMallServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingDiscountService.java
周晓航 committed
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| main/java/com/freemud/sdk/api/assortment/order | Loading commit data... | |
| test | Loading commit data... |