Merge branch 'wvp-28181-2.0'

648540858

2022-09-26 2ff3cdb6a1550941dbd36585749499064db4f8d5

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

@@ -53,4 +53,6 @@
     * @return
     */
    int updateGbIdOrName(List<StreamPushItem> streamPushItemForUpdate);

    DeviceChannel getDeviceChannelListByStreamWithStatus(GbStream gbStream, String catalogId, ParentPlatform platform);
}