Merge branch '2.6.9' into wvp-28181-2.0

648540858

2024-01-31 fc74ce9de4c38d56ee429893758776eeb5432e9b

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

@@ -245,6 +245,10 @@

    @Override
    public void batchUpdateChannel(List<DeviceChannel> channels) {
        String now = DateUtil.getNow();
        for (DeviceChannel channel : channels) {
            channel.setUpdateTime(now);
        }
        channelMapper.batchUpdate(channels);
        for (DeviceChannel channel : channels) {
            if (channel.getParentId() != null) {