From 5e272330c2570eaf485bc65157f17267abeada11 Mon Sep 17 00:00:00 2001
From: dengming <dengming@ctfo.com>
Date: 星期四, 10 三月 2022 17:52:59 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' of github.com:AbnerSC/wvp-GB28181-pro into wvp-28181-2.0

---
 src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
index 2431699..5e6ffed 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
@@ -231,7 +231,6 @@
             "        name as title,\n" +
             "        channelId as \"value\",\n" +
             "        channelId as \"key\",\n" +
-            "        channelId,\n" +
             "        longitude,\n" +
             "        latitude\n" +
             "        from device_channel\n" +

--
Gitblit v1.8.0