readme.md
1.63 KB
-
Merge branch 'feature/20200513_爱马哥兼容' into qa · e6f56e0e# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # order-application-service/pom.xml
shuhu.hou@freemud.cn committed
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # order-application-service/pom.xml