From 66e67569095f0ba871c2b584ceed73dfaa50d00c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 12 七月 2022 16:28:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into liujie-20220712

---
 sql/update.sql |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 47 insertions(+), 0 deletions(-)

diff --git a/sql/update.sql b/sql/update.sql
index 9fd7713..f3ca465 100644
--- a/sql/update.sql
+++ b/sql/update.sql
@@ -15,12 +15,14 @@
 
 alter table stream_push
     add serverId varchar(50) not null;
+
 alter table device
     add geoCoordSys varchar(50) not null;
 alter table device
     add treeType varchar(50) not null;
 update device set device.geoCoordSys='WGS84';
 update device set device.treeType='CivilCode';
+
 alter table device_channel
     add longitudeGcj02 double default null;
 alter table device_channel
@@ -31,4 +33,49 @@
     add latitudeWgs84 double default null;
 alter table device_channel
     add businessGroupId varchar(50) default null;
+alter table device_channel
+    add gpsTime varchar(50) default null;
+
+
+alter table device_mobile_position
+    change  cnLng longitudeGcj02 double default null;
+alter table device_mobile_position
+    change  cnLat latitudeGcj02 double default null;
+alter table device_mobile_position
+    add longitudeWgs84 double default null;
+alter table device_mobile_position
+    add latitudeWgs84 double default null;
+alter table device_mobile_position
+    drop geodeticSystem;
+alter table device_mobile_position
+    add createTime varchar(50) default null;
+
+alter table device_alarm
+    add createTime varchar(50) default null;
+
+alter table gb_stream
+    change createStamp createTime varchar(50) default null;
+
+alter table parent_platform
+    add createTime varchar(50) default null;
+alter table parent_platform
+    add updateTime varchar(50) default null;
+
+alter table stream_proxy
+    add updateTime varchar(50) default null;
+
+alter table stream_push
+    add pushTime varchar(50) default null;
+alter table stream_push
+    add status int DEFAULT NULL;
+alter table stream_push
+    add updateTime varchar(50) default null;
+alter table stream_push
+    change createStamp createTime varchar(50) default null;
+
+alter table gb_stream
+    drop column status;
+
+alter table user
+    add pushKey varchar(50) default null;
 

--
Gitblit v1.8.0