提交

ff3c83a7 · 王洁 · 059e0c0b · ff3c83a7
Commit ff3c83a7 authored Jun 20, 2019 by 王洁
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

UPGRADE_2.x.md
+0 -4

No files found.
--- a/UPGRADE_2.x.md
+++ b/UPGRADE_2.x.md
 # 2.0.11
-<<<<<<< HEAD
- 关闭拼团活动状态
-=======
 - 砍价订单枚举状态加订单删除
->>>>>>> 8887e37d5cd0b39fa492322fcd50ff949a7bbc4f

 # 2.0.10
 - 根据商户平台id获取对应的小程序托管配置