From 07fa589e06415ca41fc29d22c7c8f3f1b4917147 Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期一, 23 五月 2022 09:42:32 +0800
Subject: [PATCH] 处理冲突

---
 sql/update.sql |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/sql/update.sql b/sql/update.sql
index 5804518..9c18c26 100644
--- a/sql/update.sql
+++ b/sql/update.sql
@@ -1,8 +1,12 @@
-alter table device
-    add subscribeCycleForMobilePosition int null;
+alter table parent_platform
+    add startOfflinePush int default 0 null;
+
+alter table parent_platform
+    add administrativeDivision varchar(50) not null;
+
+alter table parent_platform
+    add catalogGroup int default 1 null;
 
 alter table device
-    add mobilePositionSubmissionInterval int default 5 null;
+    add ssrcCheck int default 0 null;
 
-alter table device
-    add subscribeCycleForAlarm int null;
\ No newline at end of file

--
Gitblit v1.8.0