pom.xml
13.4 KB
-
Merge remote-tracking branch 'remotes/origin/feature/1.9.32_商品加料' into develop · 96f7c628
# Conflicts: # assortment-shoppingcart-sdk/pom.xml # shopping-cart-application-service/pom.xml # shopping-cart-application-service/src/main/java/cn/freemud/enums/GoodsTypeEnum.java
xiaoer.li@freemud.com committed