Merge branch 'develop' of…

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

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	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.5.1-SNAPSHOT</version>
+    <version>1.5.2-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

assortment-ordercenter-sdk/readme.md

@@ -39,4 +39,4 @@
 | 1.3.3.RELEASE | 第三方外卖单配送费类型与新用户立减类型重复区分 | wuping | 2020-04-21 |
 | 1.5.0-SNAPSHOT | APP渠道 | 丁凯 | 2020-04-22 |
 | 1.5.1-SNAPSHOT | oms订单正向操作 | 侯书虎 | 2020-04-23 |
-| 1.5.0-SNAPSHOT | 预约单打印 | 海波 | 2020-04-23 |
+| 1.5.2-SNAPSHOT | 预约单打印 | 海波 | 2020-04-23 |