From d94135c9cd8b12fc511055af4398ad3a584a44d6 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期一, 11 一月 2021 17:46:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into wvp-28181-2.0

---
 web_src/src/components/channelList.vue |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index a8392d0..9772324 100644
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -31,6 +31,8 @@
             <el-table ref="channelListTable" :data="deviceChannelList" :height="winHeight" border style="width: 100%">
                 <el-table-column prop="channelId" label="閫氶亾缂栧彿" width="210">
                 </el-table-column>
+                <el-table-column prop="channelId" label="璁惧缂栧彿" width="210">
+                </el-table-column>
                 <el-table-column prop="name" label="閫氶亾鍚嶇О">
                 </el-table-column>
                 <el-table-column prop="subCount" label="瀛愯妭鐐规暟">

--
Gitblit v1.8.0