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

xiaoQQya

2023-11-06 b73747138d4808a83448e11ee56e766553f511e4

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