pom.xml
2.42 KB
-
Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into qa · 3846b179
# Conflicts: # assortment-shoppingcart-sdk/pom.xml # shopping-cart-application-service/pom.xml
xiaoer.li committed
# Conflicts: # assortment-shoppingcart-sdk/pom.xml # shopping-cart-application-service/pom.xml