648540858 197f80581b Merge branch 'main' into main2 ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/ISIPCommanderForPlatform.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java		2023-02-10 16:25:33 +08:00
..
common	支持全局异常和统一返回结果	2022-08-22 16:17:28 +08:00
console	国标录像UI重构	2023-01-09 16:31:51 +08:00
dialog	Merge branch 'main' into main2	2023-02-10 16:25:33 +08:00
service	同时支持打包为Jar和War	2023-02-07 20:59:33 +08:00
setting	优化按需拉流配置，拉流代理支持按需拉流	2022-10-17 16:38:28 +08:00
CloudRecord.vue	同时支持打包为Jar和War	2023-02-07 20:59:33 +08:00
CloudRecordDetail.vue	同时支持打包为Jar和War	2023-02-07 20:59:33 +08:00
DeviceList.vue	同时支持打包为Jar和War	2023-02-07 20:59:33 +08:00
GBRecordDetail.vue	同时支持打包为Jar和War	2023-02-07 20:59:33 +08:00
GeoConvertTools.js	增加移动位置显示功能	2021-01-27 15:24:28 +08:00
Login.vue	同时支持打包为Jar和War	2023-02-07 20:59:33 +08:00
MediaServerManger.vue	优化大数据下的设备树加载	2022-05-31 15:54:39 +08:00
ParentPlatformList.vue	同时支持打包为Jar和War	2023-02-07 20:59:33 +08:00
PushVideoList.vue	同时支持打包为Jar和War	2023-02-07 20:59:33 +08:00
StreamProxyList.vue	同时支持打包为Jar和War	2023-02-07 20:59:33 +08:00
UserManager.vue	同时支持打包为Jar和War	2023-02-07 20:59:33 +08:00
channelList.vue	同时支持打包为Jar和War	2023-02-07 20:59:33 +08:00
console.vue	同时支持打包为Jar和War	2023-02-07 20:59:33 +08:00
live.vue	同时支持打包为Jar和War	2023-02-07 20:59:33 +08:00
map.vue	同时支持打包为Jar和War	2023-02-07 20:59:33 +08:00