648540858 2c89fae49a Merge branch 'refs/heads/2.7.1' ... # Conflicts: # pom.xml # src/main/java/com/genersoft/iot/vmp/conf/security/WebSecurityConfig.java # src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/NotifyRequestForMobilePositionProcessor.java # src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java # src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java # src/main/java/com/genersoft/iot/vmp/service/ICloudRecordService.java # src/main/java/com/genersoft/iot/vmp/service/bean/CloudRecordItem.java # src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java # src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java # src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java # src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java		2024-05-23 17:32:15 +08:00
..
2.6.9	合并269分支修复的内容	2024-01-10 19:14:11 +08:00
2.7.0	Merge branch 'refs/heads/2.7.0'	2024-04-23 20:59:20 +08:00
2.7.1	Merge branch 'refs/heads/2.7.1'	2024-05-23 17:32:15 +08:00
old	sql重命名为数据库	2023-11-01 15:36:35 +08:00