readme.md
1003 Bytes
-
Merge branch 'feature/20201201_xukang_麦咖啡p4v1' into qa · c14b5bd5
# Conflicts: # assortment-shoppingcart-sdk/pom.xml # shopping-cart-application-service/pom.xml
徐康 committed
# Conflicts: # assortment-shoppingcart-sdk/pom.xml # shopping-cart-application-service/pom.xml