From 38a85d432ae9bb861dbcbf090d68fb3dca0d85f6 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 29 十一月 2022 17:51:45 +0800
Subject: [PATCH] 修复合并的bug

---
 sql/update.sql |   44 +++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 43 insertions(+), 1 deletions(-)

diff --git a/sql/update.sql b/sql/update.sql
index d6386ea..877e247 100644
--- a/sql/update.sql
+++ b/sql/update.sql
@@ -1 +1,43 @@
-ALTER TABLE stream_proxy ADD status bit(1) not null;
\ No newline at end of file
+alter table media_server
+    drop column streamNoneReaderDelayMS;
+
+alter table media_server
+    drop column sendRtpPortRange;
+
+alter table stream_proxy
+    add enable_disable_none_reader bit(1) default null;
+
+alter table device
+    add mediaServerId varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 'auto';
+
+alter table device
+    add custom_name varchar(255) default null;
+
+alter table device
+    add sdpIp varchar(50) default null;
+
+alter table device
+    add localIp varchar(50) default null;
+
+alter table device
+    add password varchar(255) default null;
+
+alter table device
+    modify ip varchar(50) null;
+
+alter table device
+    modify port int null;
+
+alter table device
+    modify expires int null;
+
+alter table device
+    modify subscribeCycleForCatalog int null;
+
+alter table device
+    modify hostAddress varchar(50) null;
+
+alter table stream_proxy
+    change enable_hls enable_audio bit null;
+
+

--
Gitblit v1.8.0