Merge branch '2.6.9' into wvp-28181-2.0

648540858

2024-01-31 bf0efc2739fb76a4b34c4e43754a9b4041d38ffa

 src/main/java/com/genersoft/iot/vmp/storager/IVideoManagerStorage.java

old mode 100644
new mode 100755
@@ -342,9 +342,9 @@

   int addCatalog(PlatformCatalog platformCatalog);

   PlatformCatalog getCatalog(String id);
   PlatformCatalog getCatalog(String platformId, String id);

   int delCatalog(String id);
   int delCatalog(String platformId, String id);

   int updateCatalog(PlatformCatalog platformCatalog);

@@ -378,4 +378,7 @@

   List<DeviceChannelExtend> queryChannelsByDeviceId(String serial, List<String> channelIds, Boolean online);

   List<ParentPlatform> queryEnablePlatformListWithAsMessageChannel();

   List<Device> queryDeviceWithAsMessageChannel();
}