pom.xml
4.81 KB
-
Merge branch 'feature/20201112_优惠为0的券也要核销_xukang' into qa · 0ed05806
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java # order-application-service/pom.xml # order-application-service/src/main/java/cn/freemud/service/mccafe/impl/CouponClientServiceImpl.java # ordercenter-sdk/pom.xml
徐康 committed