合并269分支修复的内容

数据库/2.6.9/初始化-mysql-2.6.9.sql

@@ -261,6 +261,7 @@ create table wvp_stream_push (
                                  create_time character varying(50),
                                  alive_second integer,
                                  media_server_id character varying(50),
+                                 server_id character varying(50),
                                  push_time character varying(50),
                                  status bool default false,
                                  update_time character varying(50),

数据库/2.6.9/初始化-postgresql-kingbase-2.6.9.sql

@@ -261,6 +261,7 @@ create table wvp_stream_push (
                                  create_time character varying(50),
                                  alive_second integer,
                                  media_server_id character varying(50),
+                                 server_id character varying(50),
                                  push_time character varying(50),
                                  status bool default false,
                                  update_time character varying(50),