Merge branch 'master' into dev/数据库统合
# Conflicts: # src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java
This commit is contained in:
@@ -358,8 +358,8 @@ 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 int8,
|
||||
time_len int8,
|
||||
|
||||
Reference in New Issue
Block a user