桌位合并取消

@@ -32,6 +32,8 @@ class Table {
   String isLock; //是否被合并上锁
   String isLock; //是否被合并上锁
   String isMerge; //是否打开桌位合并开关
   String isMerge; //是否打开桌位合并开关
   String tids; //被合并桌位tids
   String tids; //被合并桌位tids
+
+  String tidsCancel; //关闭开关取消合并的时候使用,
   String lockTname; //被谁合并了
   String lockTname; //被谁合并了
   String lockTid; //被合并桌位id
   String lockTid; //被合并桌位id
   String label; //底部标签 （新客，婚宴）
   String label; //底部标签 （新客，婚宴）

@@ -31,6 +31,7 @@ Table _$TableFromJson(Map<String, dynamic> json) {
     ..isLock = json['is_lock'] as String
     ..isLock = json['is_lock'] as String
     ..isMerge = json['is_merge'] as String
     ..isMerge = json['is_merge'] as String
     ..tids = json['tids'] as String
     ..tids = json['tids'] as String
+    ..tidsCancel = json['tids'] as String
     ..lockTname = json['lock_tname'] as String
     ..lockTname = json['lock_tname'] as String
     ..reserveCount = json['reserveCount'] as String
     ..reserveCount = json['reserveCount'] as String
     ..phone=json['phone'] as String
     ..phone=json['phone'] as String

@@ -147,7 +147,7 @@ class MyTableManagerHomePageState extends State<MyTableManagerHomePage> {
     Map<String, String> params = {
     Map<String, String> params = {
       'tid': table.id,
       'tid': table.id,
       'is_merge': isMerge,
       'is_merge': isMerge,
-      'tids': tids
+      'tids': isMerge == '0' ? table.tidsCancel : tids
       // 'tids': isMerge == '0' ? '' : tids
       // 'tids': isMerge == '0' ? '' : tids
     };
     };