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

..

main

Merge branch 'master' into 重构/1078

2024-11-10 15:29:53 +08:00

test/java/com/genersoft/iot/vmp/jt1078

支持从数据库查询注册的设备是否合法

2024-03-13 00:04:52 +08:00