pom.xml
13.1 KB
-
Merge branch 'feature-2020/4/16-1.9.20-满减配送费记录修改-海波' into qa · 9d2f0288
# Conflicts: # order-application-service/pom.xml # order-application-service/src/main/resources/application-qa.properties
姜海波 committed
# Conflicts: # order-application-service/pom.xml # order-application-service/src/main/resources/application-qa.properties