Merge remote-tracking branch 'remotes/origin/feature/1.9.11_goodsGroup' into qa
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java # order-application-service/pom.xml
Showing
Please
register
or
sign in
to comment