panlinlin 48c0893de3 Merge remote-tracking branch 'origin/master' into wvp-28181-2.0 ... # Conflicts: # README.md # src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java # src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEvent.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorager.java # src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java # src/main/java/com/genersoft/iot/vmp/vmanager/SseController/SseController.java # src/main/java/com/genersoft/iot/vmp/vmanager/service/IPlayService.java # src/main/java/com/genersoft/iot/vmp/vmanager/service/impl/PlayServiceImpl.java # src/main/resources/wvp.sqlite # web_src/.postcssrc.js # web_src/src/components/UiHeader.vue # web_src/src/main.js # web_src/src/router/index.js		2021-02-25 18:10:02 +08:00
..
gb28181	修正初次打开通道选择列表每页数量不对的问题	2021-01-14 23:41:54 +08:00
channelList.vue	完成向上级联->选择通道-003	2021-01-13 17:08:26 +08:00
control.vue	改为24小时制显示	2020-11-09 18:42:59 +08:00
devicePosition.vue	调整界面布局	2021-02-03 10:54:41 +08:00
GeoConvertTools.js	增加移动位置显示功能	2021-01-27 15:24:28 +08:00
Login.vue	修复各页面按下回车键都会退回Contral页面的问题	2021-01-28 14:26:48 +08:00
ParentPlatformList.vue	修正级联通道选择编辑关联错误	2021-01-20 20:25:44 +08:00
platformEdit.vue	修正修改过上级平台信息后再次创建上级平台按钮不会变为'立即创建'的问题	2021-01-14 23:46:09 +08:00
UiHeader.vue	Merge remote-tracking branch 'origin/master' into wvp-28181-2.0	2021-02-25 18:10:02 +08:00
videoList.vue	调整界面布局	2021-02-03 10:54:41 +08:00