Merge branch 'wvp-28181-2.0' into wvp-28181-2.0

sql/2.6.8升级2.6.9.sql

@@ -38,7 +38,7 @@ alter table device
     change geoCoordSys geo_coord_sys varchar(50) not null;
 
 alter table device
-    change treeType tree_type varchar(50) not null;
+    drop column treeType;
 
 alter table device
     change mediaServerId media_server_id varchar(50) default 'auto' null;
@@ -297,7 +297,7 @@ alter table parent_platform
     change updateTime update_time varchar(50) null;
 
 alter table parent_platform
-    change treeType tree_type varchar(50) not null;
+    drop column treeType;
 
 alter table parent_platform
     change asMessageChannel as_message_channel bool default false;

sql/初始化.sql

@@ -24,7 +24,6 @@ create table wvp_device (
                             charset character varying(50),
                             ssrc_check bool default false,
                             geo_coord_sys character varying(50),
-                            tree_type character varying(50),
                             media_server_id character varying(50),
                             custom_name character varying(255),
                             sdp_ip character varying(50),
@@ -187,7 +186,6 @@ create table wvp_platform (
                               catalog_group integer,
                               create_time character varying(50),
                               update_time character varying(50),
-                              tree_type character varying(50),
                               as_message_channel bool default false,
                               constraint uk_platform_unique_server_gb_id unique (server_gb_id)
 );