-
Merge remote-tracking branch 'origin/feature/2020-1104-混合支付' into feature/20201110_混合支付退款_张志恒 · d046b832
# Conflicts: # assortment-ordercenter-sdk/pom.xml # 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/response/order/QueryOrdersResponse.java # order-application-service/pom.xml # order-management/pom.xml # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/response/orderInfo/OrderInfoReqs.java
张志恒 committed
Name |
Last commit
|
Last update |
---|---|---|
.. | ||
main | Loading commit data... | |
test/java/cn.freemud | Loading commit data... |