From 20cd60c66c053fb48ce6258d89458d30418903b5 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 17 十月 2022 17:23:38 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-28181-2.0

---
 sql/update.sql |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/sql/update.sql b/sql/update.sql
index 0abc544..817d94e 100644
--- a/sql/update.sql
+++ b/sql/update.sql
@@ -1,4 +1,10 @@
-alter table stream_push
-    add serverId varchar(50) not null;
+alter table media_server
+    drop column streamNoneReaderDelayMS;
 
+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;

--
Gitblit v1.8.0