sunyu::update::resolve conflicts

assortment-ordercenter-sdk/readme.md

@@ -88,12 +88,9 @@
 | 2.2.18-SNAPSHOT|  抖音支付新增抖音单号和openId   | 张志恒 | 2020-12-4 |
 | 2.1.7-RELEASE | 农工商撤单 | 张志恒 | 2020-12-07 |
 | 2.2.20-SNAPSHOT| 抖音支付  | 张志恒 | 2020-12-11ß |
-
-
 | 2.1.8-RELEASE | 拼单 | 缪晖 | 2020-12-10 |
 | 2.1.9-RELEASE | 去掉0元核销优惠券 | 李小二 | 2020-12-14 |
 | 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.19-SNAPSHOT | 增加配送类型字段 | 王航航 | 2020-12-22 |
+| 2.1.19-SNAPSHOT | 增加配送类型字段 | 王航航 | 2020-12-22 |
\ No newline at end of file