648540858 96bb3814f6 Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java # src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java # web_src/src/components/dialog/devicePlayer.vue # web_src/src/components/live.vue		2022-11-08 20:43:25 +08:00
..
common	支持全局异常和统一返回结果	2022-08-22 16:17:28 +08:00
console	优化hook处理速度	2022-11-08 19:58:36 +08:00
dialog	Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network	2022-11-08 20:43:25 +08:00
service	支持全局异常和统一返回结果	2022-08-22 16:17:28 +08:00
setting	优化按需拉流配置，拉流代理支持按需拉流	2022-10-18 17:35:32 +08:00
channelList.vue	优化sip消息	2022-09-09 17:06:19 +08:00
CloudRecord.vue	修改云端录像选择节点流媒体path不修改的bug	2022-10-18 20:18:51 +08:00
CloudRecordDetail.vue	云端录像详情页添加返回按钮	2022-08-31 18:07:53 +08:00
console.vue	首页改造完成,添加系统信息	2022-10-24 18:14:31 +08:00
DeviceList.vue	支持手动添加，为设备设置单独的密码	2022-10-18 17:35:44 +08:00
GeoConvertTools.js	增加移动位置显示功能	2021-01-27 15:24:28 +08:00
live.vue	Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network	2022-11-08 20:43:25 +08:00
Login.vue	云端录像详情页添加返回按钮	2022-08-31 18:07:53 +08:00
map.vue	支持全局异常和统一返回结果	2022-08-22 16:17:28 +08:00
MediaServerManger.vue	优化大数据下的设备树加载	2022-05-31 15:54:39 +08:00
ParentPlatformList.vue	修复选择通道时默认节点显示错误的问题	2022-09-06 16:31:28 +08:00
PushVideoList.vue	支持全局异常和统一返回结果	2022-08-22 16:17:28 +08:00
StreamProxyList.vue	优化异常处理	2022-09-01 17:53:00 +08:00
UserManager.vue	支持全局异常和统一返回结果	2022-08-22 16:17:28 +08:00