readme.md
1.69 KB
-
Merge remote-tracking branch 'remotes/origin/feature/套餐固定商品主食标识_1.9.19' into qa · fa1a003d
# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-application-service/pom.xml
xiaoer.li@freemud.com committed
# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-application-service/pom.xml