Merge remote-tracking branch 'origin/wvp-28181-2.0' into map

648540858

2022-04-21 190fc62b7297443cafa8db9c47fd8a9b74339876

 src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java

@@ -246,7 +246,9 @@
            "        channelId as \"value\",\n" +
            "        channelId as \"key\",\n" +
            "        longitude,\n" +
            "        latitude\n" +
            "        latitude,\n" +
            "        PTZType,\n" +
            "        subCount\n" +
            "        from device_channel\n" +
            "        where deviceId = #{deviceId}")
    List<DeviceChannelTree> tree(String deviceId);