Merge branch 'wvp-28181-2.0' into main-dev

648540858

2023-10-12 2673fbb0bf7af6405c544cc8a56f17d03018c59a

 src/main/java/com/genersoft/iot/vmp/service/impl/PlatformChannelServiceImpl.java

@@ -162,7 +162,7 @@
            return 0;
        }
        if (ObjectUtils.isEmpty(catalogId)) {
           catalogId = platform.getDeviceGBId();
           catalogId = null;
        }

        if ((result = platformChannelMapper.delChannelForGBByCatalogId(platformId, catalogId)) > 0) {