Merge branch 'develop' of…

Merge branch 'develop' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	assortment-ordercenter-sdk/readme.md

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>1.4.7-SNAPSHOT</version>
+    <version>1.4.8-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

assortment-ordercenter-sdk/readme.md

@@ -30,5 +30,5 @@
 | 1.4.4-SNAPSHOT | 订单扩展信息 | 丁凯 | 2020-04-13 |
 | 1.2.8.RELEASE | 增加延时队列 | 海波 | 2020-04-13 |
 | 1.4.5-SNAPSHOT | 订单app渠道 | 丁凯 | 2020-04-16 |
-| 1.4.6-SNAPSHOT | 增加实际配送费 | 海波 | 2020-04-17 |
 | 1.4.7-SNAPSHOT | 去掉无用字符写入ext_info | 李小二 | 2020-04-17 |
+| 1.4.8-SNAPSHOT | 增加实际配送费 | 海波 | 2020-04-17 |