Merge branch 'feature-2020/4/16-1.9.20-满减配送费记录修改-海波' into qa

# Conflicts:
#	order-application-service/pom.xml
#	order-application-service/src/main/resources/application-qa.properties

order-application-service/pom.xml

@@ -40,7 +40,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>assortment-ordercenter-sdk</artifactId>
-            <version>1.4.1-SNAPSHOT</version>
+            <version>1.4.6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>