Skip to content

O
order-group
Commit a970643e by hanghang.wang
Options

解决冲突

parents cb6d2ac8 a5284f23
Showing with 0 additions and 2 deletions
assortment-ordercenter-sdk/readme.md
...@@ -111,7 +111,6 @@ ...@@ -111,7 +111,6 @@
| 2.2.20-SNAPSHOT| 抖音支付 | 张志恒 | 2020-12-11 | | 2.2.20-SNAPSHOT| 抖音支付 | 张志恒 | 2020-12-11 |
| 2.2.22-SNAPSHOT| 添加储值卡支付 | 梁崇福 | 2020-12-22 | | 2.2.22-SNAPSHOT| 添加储值卡支付 | 梁崇福 | 2020-12-22 |
| 2.2.24-SNAPSHOT| 抖音支付新增抖音单号和openId | 张志恒 | 2020-12-22 | | 2.2.24-SNAPSHOT| 抖音支付新增抖音单号和openId | 张志恒 | 2020-12-22 |
=======
| 1.5.11.RELEASE | 预约单任务删除RELEASE | wuping | 2020-06-15 | | 1.5.11.RELEASE | 预约单任务删除RELEASE | wuping | 2020-06-15 |
| 1.5.12.RELEASE | 围餐 | dingkai | 2020-06-16 | | 1.5.12.RELEASE | 围餐 | dingkai | 2020-06-16 |
| 1.5.13.RELEASE | 小助手营业额统计 | 梁崇福 | 2020-06-22 | | 1.5.13.RELEASE | 小助手营业额统计 | 梁崇福 | 2020-06-22 |
...@@ -138,7 +137,6 @@ ...@@ -138,7 +137,6 @@
| 2.1.7-RELEASE | 农工商撤单 | 张志恒 | 2020-12-07 | | 2.1.7-RELEASE | 农工商撤单 | 张志恒 | 2020-12-07 |
| 2.1.8-RELEASE | 拼单 | 缪晖 | 2020-12-10 | | 2.1.8-RELEASE | 拼单 | 缪晖 | 2020-12-10 |
| 2.1.9-RELEASE | 去掉0元核销优惠券 | 李小二 | 2020-12-14 | | 2.1.9-RELEASE | 去掉0元核销优惠券 | 李小二 | 2020-12-14 |
>>>>>>> feature/20201216_切换门店清除代金券缓存_yu.sun
| 2.1.10-RELEASE | coco | 刘鹏飞 | 2020-12-17 | | 2.1.10-RELEASE | coco | 刘鹏飞 | 2020-12-17 |
| 2.1.11-RELEASE | 农工商添加设备号 | 梁崇福 | 2020-12-17 | | 2.1.11-RELEASE | 农工商添加设备号 | 梁崇福 | 2020-12-17 |
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment