Merge branch '2.6.9' into wvp-28181-2.0

648540858

2024-01-19 47e5d2b00b5b13c1004f94a7ccd3f406391698a0

 src/main/java/com/genersoft/iot/vmp/service/IGbStreamService.java

@@ -69,4 +69,6 @@
     * @param catalogId
     */
    void delAllPlatformInfo(String platformId, String catalogId);

    List<GbStream> getGbChannelWithGbid(String gbId);
}