pom.xml
4.81 KB
-
Merge remote-tracking branch 'remotes/origin/feature/1.9.29_蜜雪中台订单区分支付方式' into qa · 352c68ba# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # ordercenter-sdk/pom.xml # ordercenter-sdk/readme.md # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java
xiaoer.li@freemud.com committed