readme.md
455 Bytes
-
Merge branch 'feature/v1.9.9_农工商订单结算&撤销' into develop · 665d5b08# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/ConfirmOrderRequest.java # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md
shuhu.hou@freemud.cn committed