readme.md
1.73 KB
-
Merge remote-tracking branch 'remotes/origin/fix_集点不参与积分同享' into qa · b146a541
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # order-application-service/pom.xml # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md
xiaoer.li@freemud.com committed