pom.xml
16.3 KB
-
Merge remote-tracking branch 'remotes/origin/feature/refundJudgeNull-刘鹏飞' into develop · b8c6416e# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/readme.md # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java # order-application-service/pom.xml # order-management/pom.xml # ordercenter-sdk/pom.xml
刘鹏飞 committed