-
Merge branch 'hotfix/20200522_同意退款取消配送单fixbug' into qa · 2e516ade# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # assortment-shoppingcart-sdk/pom.xml # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/entities/dto/OrderExtInfoDto.java # order-application-service/src/main/java/cn/freemud/service/AppOrderService.java # order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # order-management/pom.xml # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderCancelReq.java # shopping-cart-application-service/pom.xml
shuhu.hou@freemud.cn committed
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| adapter | Loading commit data... | |
| controller | Loading commit data... | |
| entities/dto | Loading commit data... | |
| enums | Loading commit data... | |
| intercept | Loading commit data... | |
| service | Loading commit data... | |
| util | Loading commit data... |