648540858 14174ff400 Merge branch 'wvp-28181-2.0' into wvp-pro-record ... # Conflicts: # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/AckRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java # src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java		2022-03-03 16:28:32 +08:00
..
alarm	添加用户操作	2021-08-05 07:25:12 +08:00
device	支持删除在线设备	2022-02-28 17:56:27 +08:00
gbStream	规范数据库，给各个标设置主键ID	2022-02-22 11:44:56 +08:00
media	规范数据库，解决bug	2022-02-25 20:33:02 +08:00
MobilePosition	去除查询类api调用的日志	2021-11-02 16:56:24 +08:00
platform	Merge branch 'wvp-28181-2.0' into wvp-pro-record	2022-03-02 12:52:37 +08:00
play	国标录像支持多端同时播放	2022-03-03 15:57:28 +08:00
playback	国标录像支持多端同时播放	2022-03-03 15:57:28 +08:00
ptz	#247	2022-01-28 16:45:12 +08:00
record	同步主线	2022-02-23 21:55:46 +08:00
session	优化info消息的cseq计数	2021-12-14 18:41:50 +08:00
SseController	SSE推送请求应为GET	2021-06-22 11:33:37 +08:00