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 |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/sql/update.sql b/sql/update.sql
new file mode 100644
index 0000000..9c18c26
--- /dev/null
+++ b/sql/update.sql
@@ -0,0 +1,12 @@
+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 ssrcCheck int default 0 null;
+

--
Gitblit v1.8.0