Merge branch 'feature/2020-12-14_order-group_wanghanghang' 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>2.2.25-SNAPSHOT</version>
+    <version>2.2.26-SNAPSHOT</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>

assortment-ordercenter-sdk/readme.md

@@ -140,5 +140,8 @@
 
 | 2.1.10-RELEASE | coco | 刘鹏飞 | 2020-12-17 |
 | 2.1.11-RELEASE | 农工商添加设备号 | 梁崇福 | 2020-12-17 |
-| 2.2.25-SNAPSHOT | 订单详情查询接口增加配送类型字段 | 张志恒 | 2020-12-23 |
 | 2.2.25-SNAPSHOT|  coco定制核销优惠券   | 刘鹏飞 | 2020-12-23 |
+| 2.1.10-RELEASE | coco | 刘鹏飞 | 2020-12-17 |
+| 2.1.11-RELEASE | 农工商添加设备号 | 梁崇福 | 2020-12-17 |
+| 2.1.12-RELEASE | coco定制优惠券核销 | 刘鹏飞 | 2020-12-24 |
+| 2.1.26-SNAPSHOT | 增加配送类型字段 | 王航航 | 2020-12-24 |
\ No newline at end of file