解决冲突+ 修改单词

UPGRADE_2.x.md

 # 2.0.11
+<<<<<<< HEAD
 - 关闭拼团活动状态
+=======
+- 砍价订单枚举状态加订单删除
+>>>>>>> 8887e37d5cd0b39fa492322fcd50ff949a7bbc4f
 
 # 2.0.10
 - 根据商户平台id获取对应的小程序托管配置

src/Bargain/Enum/BargainEnum.php

@@ -21,6 +21,6 @@ class BargainEnum
     const PAY_EXCEPTION = 3;
     const PAY_REFUND = 4;   // 退款
     const PAY_CLOSE = 5;   // 订单关闭
-    const ORDER_DELELTED = 6; //订单删除
+    const ORDER_DELETED = 6; //订单删除
 
 }
\ No newline at end of file