648540858 2a4a0d36f2 Merge branch 'wvp-28181-2.0' into 结构优化 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java # src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java # src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java # src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/gbStream/GbStreamController.java		2024-01-16 14:53:26 +08:00
..
assets	修复心跳异常，支持通道列表，推流列表，拉流代理列表直接查看对应的云端录像，兼容大于INT的ssrc的格式化	2023-08-16 01:55:50 +08:00
components	Merge branch 'wvp-28181-2.0' into 结构优化	2024-01-16 14:53:26 +08:00
layout	fix(报警推送): 修复报警推送功能无效的问题	2023-11-06 20:34:58 +08:00
router	修复心跳异常，支持通道列表，推流列表，拉流代理列表直接查看对应的云端录像，兼容大于INT的ssrc的格式化	2023-08-16 01:55:50 +08:00
App.vue	修复心跳异常，支持通道列表，推流列表，拉流代理列表直接查看对应的云端录像，兼容大于INT的ssrc的格式化	2023-08-16 01:55:50 +08:00
main.js	fix(报警推送): 修复报警推送功能无效的问题	2023-11-06 20:34:58 +08:00