Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0

xu-bin-bin

2023-10-24 ae9976bb3a59cc3d9952dda6d9388bb412baa158

 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);