Merge branch '2.6.9' into wvp-28181-2.0

648540858

2024-01-04 a2cac5ca12f100d052cb31122a84de4bba829bca

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