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
..
2.6.9	临时提交	2024-08-22 18:07:42 +08:00
2.7.0	临时提交	2024-08-22 18:07:42 +08:00
2.7.1	临时提交	2024-08-22 18:07:42 +08:00
2.7.3	修复建表语句不同步	2024-10-29 17:35:45 +08:00
2.7.3.old	调整配置以及数据库目录	2024-10-12 09:11:21 +08:00
JT1078-2.7.2	1078-添加接入国标通道页面以及属性	2024-06-18 05:55:42 +08:00
old	临时提交	2024-08-22 18:05:57 +08:00