readme.md
1.73 KB
-
Merge remote-tracking branch 'remotes/origin/bugfix_套餐折扣' into qa · 4a17e639
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # order-application-service/pom.xml # order-management/pom.xml # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md # shopping-cart-application-service/pom.xml # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuySendPromotionService.java
xiaoer.li@freemud.com committed