-
Merge branch 'master' of gitlab.freemud.com:order-group-application/order-group into qa · 6fa35f93# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # assortment-shoppingcart-sdk/pom.xml # call-back-service/pom.xml # order-application-service/pom.xml # order-management/pom.xml # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md # shopping-cart-application-service/pom.xml
张洪旺 committed