Merge branch 'refs/heads/2.7.0' into 271-优化notify存储

648540858

2024-05-13 588b1da35a1a51ddfca76fb8ca9c2c0c6cd70038

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