From ccc0a99d6894844d83d751b924cfebe74da7826c Mon Sep 17 00:00:00 2001
From: ‘sxh’ <1632740646@qq.com>
Date: 星期四, 15 六月 2023 11:20:43 +0800
Subject: [PATCH] 同步主线的代码，保持一致性
---
sql/2.6.8升级2.6.9.sql | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git "a/sql/2.6.8\345\215\207\347\272\2472.6.9.sql" "b/sql/2.6.8\345\215\207\347\272\2472.6.9.sql"
index 32baaa8..a6b9f12 100644
--- "a/sql/2.6.8\345\215\207\347\272\2472.6.9.sql"
+++ "b/sql/2.6.8\345\215\207\347\272\2472.6.9.sql"
@@ -55,6 +55,9 @@
alter table device
change keepaliveIntervalTime keepalive_interval_time int null;
+alter table device
+ change online on_line varchar(50) null;
+
alter table device_alarm
change deviceId device_id varchar(50) not null;
@@ -175,10 +178,6 @@
alter table device_mobile_position
change createTime create_time varchar(50) null;
-
-alter table gb_stream
- add constraint gb_stream_pk
- primary key (gbStreamId);
alter table gb_stream
change gbStreamId gb_stream_id int auto_increment;
@@ -393,10 +392,6 @@
alter table stream_push
change status status bool default false;
-
-alter table stream_push
- change serverId server_id varchar(50) not null;
-
alter table stream_push
change pushTime push_time varchar(50) null;
@@ -412,6 +407,10 @@
alter table stream_push
change self self bool default false;
+alter table stream_push
+ drop column serverId;
+
+
alter table user
change roleId role_id int not null;
--
Gitblit v1.8.0