Merge branch 'master' into dev/数据库统合

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java

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

@@ -341,12 +341,11 @@ create table wvp_cloud_record
     media_server_id character varying(50),
     server_id       character varying(50),
     file_name       character varying(255),
-    folder          character varying(255),
-    file_path       character varying(255),
+    folder          character varying(500),
+    file_path       character varying(500),
     collect         bool default false,
     file_size       bigint,
-    time_len        bigint,
-    constraint uk_stream_push_app_stream_path unique (app, stream, file_path)
+    time_len        bigint
 );
 
 create table wvp_user