pom.xml
16.3 KB
-
Merge branch 'feature/20201110_混合支付退款_张志恒' into develop · a45e4c4d# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-application-service/pom.xml # order-management/pom.xml
zhiheng.zhang committed
# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-application-service/pom.xml # order-management/pom.xml