pom.xml
1.7 KB
-
Merge remote-tracking branch 'remotes/origin/20201026-queryRefundCount-刘鹏飞' into master · 7dd68d5b
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java # ordercenter-sdk/pom.xml
刘鹏飞 committed