648540858 2c89fae49a Merge branch 'refs/heads/2.7.1' ... # Conflicts: # pom.xml # src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForMobilePositionProcessor.java # src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java # src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java # src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java # src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java # src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java		2024-05-23 17:32:15 +08:00
..
初始化-mysql-2.7.0.sql	合并分支270	2024-04-12 16:06:21 +08:00
初始化-mysql-2.7.1.sql	支持彻底关闭文档页面 + 修复云端录像偶现callId错误问题	2024-05-23 17:10:45 +08:00
初始化-postgresql-kingbase-2.7.0.sql	合并分支270	2024-04-12 16:06:21 +08:00
初始化-postgresql-kingbase-2.7.1.sql	支持彻底关闭文档页面 + 修复云端录像偶现callId错误问题	2024-05-23 17:10:45 +08:00
更新-mysql-2.7.0.sql	优化apikey列表样式	2024-04-10 23:09:28 +08:00
更新-mysql-2.7.1.sql	兼容zlm-pro转码	2024-05-17 16:32:01 +08:00
更新-postgresql-kingbase-2.7.0.sql	优化apikey列表样式	2024-04-10 23:09:28 +08:00
更新-postgresql-kingbase-2.7.1.sql	兼容zlm-pro转码	2024-05-17 16:32:01 +08:00