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

648540858

2024-03-08 1fcdf5a8f369e020e78d524db2fe3cc7ffc86293

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

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

        List<DeviceChannel> deviceChannels = platformChannelMapper.queryAllChannelInCatalog(platformId, catalogId);