From c35932e24cf9dda9ef396ab5a45fb1a6e5539748 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 29 十月 2021 11:22:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
sql/mysql.sql | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/sql/mysql.sql b/sql/mysql.sql
index 90393e6..4501257 100644
--- a/sql/mysql.sql
+++ b/sql/mysql.sql
@@ -66,6 +66,7 @@
id int auto_increment
primary key,
deviceId varchar(50) not null,
+ channelId varchar(50) not null,
alarmPriority varchar(50) not null,
alarmMethod varchar(50),
alarmTime varchar(50) not null,
@@ -92,6 +93,7 @@
create table device_mobile_position
(
deviceId varchar(50) not null,
+ channelId varchar(50) not null,
deviceName varchar(255) null,
time varchar(50) not null,
longitude double not null,
@@ -140,6 +142,7 @@
streamNoneReaderDelayMS int not null,
rtpEnable int not null,
rtpPortRange varchar(50) not null,
+ sendRtpPortRange varchar(50) not null,
recordAssistPort int not null,
defaultServer int not null,
createTime varchar(50) not null,
@@ -239,11 +242,11 @@
create table role (
id int auto_increment
- primary key,
- name TEXT NOT NULL,
- authority TEXT NOT NULL,
- createTime varchar(50) not null,
- updateTime varchar(50) not null
+ primary key,
+ name TEXT NOT NULL,
+ authority TEXT NOT NULL,
+ createTime varchar(50) not null,
+ updateTime varchar(50) not null
);
insert into role (id, name, authority, createTime, updateTime) values ('1', 'admin', '0', '2021-04-13 14:14:57', '2021-04-13 14:14:57');
--
Gitblit v1.8.0