pom.xml
16.6 KB
-
Merge remote-tracking branch 'origin/hotfix/updateDev_20210517' into develop_mergeTest · 2f42daf5
# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-application-service/pom.xml # order-management/pom.xml # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
缪晖 committed