648540858 6b3732b8c4 Merge branch '2.6.8' into wvp-28181-2.0 ... # 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/gb28181/utils/XmlUtil.java # src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java # src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java # src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java # src/main/resources/all-application.yml # web_src/package-lock.json		2023-06-19 20:19:31 +08:00
..
common	Merge branch '2.6.8' into wvp-28181-2.0	2023-06-19 20:19:31 +08:00
conf	Merge branch '2.6.8' into wvp-28181-2.0	2023-06-19 20:19:31 +08:00
gb28181	Merge branch '2.6.8' into wvp-28181-2.0	2023-06-19 20:19:31 +08:00
jt1078	1、新增视频回放、视频回放控制Template	2023-04-28 14:39:50 +08:00
media/zlm	去除多余日志	2023-06-13 23:11:56 +08:00
service	Merge branch '2.6.8' into wvp-28181-2.0	2023-06-19 20:19:31 +08:00
storager	Merge branch '2.6.8' into wvp-28181-2.0	2023-06-19 20:19:31 +08:00
utils	添加获取截图接口	2023-05-29 23:28:06 +08:00
vmanager	Merge branch '2.6.8' into wvp-28181-2.0	2023-06-19 20:19:31 +08:00
web/gb28181	修复字段名错误	2023-05-22 11:23:48 +08:00
VManageBootstrap.java	去除druid数据库连接池，使用spring支持的hikari	2023-03-29 09:44:45 +08:00