648540858 e5fd66ef96 Merge branch 'master' into 重构/1078 ... # Conflicts: # pom.xml # src/main/java/com/genersoft/iot/vmp/conf/SpringDocConfig.java # src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java		2024-11-10 15:29:53 +08:00
..
bean	Merge branch 'master' into 重构/1078	2024-11-10 15:29:53 +08:00
cloudRecord	修复因为int自动装箱导致year和month为空时，接口报错	2024-10-31 01:16:25 +08:00
log	支持历史日志的查看，过滤以及下载	2024-11-03 14:37:30 +08:00
ps	修复国标点播缓存启动未清理的BUG	2024-10-25 17:41:50 +08:00
rtp	修复国标点播缓存启动未清理的BUG	2024-10-25 17:41:50 +08:00
server	优化运维中心样式	2024-11-04 15:46:03 +08:00
user	修复 角色查询中的重复调用 #1496	2024-10-15 17:17:10 +08:00
TestController.java	优化国标设备点播的信息的Redis缓存策略	2024-10-25 14:46:51 +08:00