lin b6c3f42a1f Merge branch 'refs/heads/master' into dev/数据库统合2 ...

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceConfig.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/controller/GBRecordController.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/IDeviceService.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/IGbChannelPlayService.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelPlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java
#	src/main/resources/配置详情.yml

2025-02-11 19:30:20 +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

Merge branch 'refs/heads/master' into dev/数据库统合2

2025-02-11 19:30:20 +08:00

old

临时提交

2024-08-22 18:05:57 +08:00