-
Merge branch 'feature/20210105_新增版本号促销有礼活动_wanghanghang' into qa · 505ee3a5# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # order-application-service/pom.xml # order-application-service/src/test/java/cn/freemud/service/impl/MallOrderServiceImplTest.java # order-management/pom.xml # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md # shopping-cart-application-service/pom.xml
hanghang.wang committed