From 2d2a1d2e042a252da1325d835588a851cec7d62d Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 3 Nov 2020 15:50:17 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=A4=BE=E7=BE=A4=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E3=80=91=E5=A2=9E=E5=8A=A0=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020-11-03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/group/group.vue      | 9 +++++++++
 src/views/modules/group/topic-list.vue | 8 ++++++++
 2 files changed, 17 insertions(+)

diff --git a/src/views/modules/group/group.vue b/src/views/modules/group/group.vue
index 65e7c75..f55d69f 100644
--- a/src/views/modules/group/group.vue
+++ b/src/views/modules/group/group.vue
@@ -41,6 +41,10 @@
                          label="社群名称"
                          header-align="center"
                          align="center"></el-table-column>
+        <el-table-column prop="dept"
+                         label="所属部门"
+                         header-align="center"
+                         align="center"></el-table-column>
         <el-table-column prop="groupCategory"
                          label="性质"
                          header-align="center"
@@ -52,6 +56,11 @@
                          header-align="center"
                          align="center"
                          width="180"></el-table-column>
+        <el-table-column prop="updatedTime"
+                         label="更新时间"
+                         header-align="center"
+                         align="center"
+                         width="180"></el-table-column>
         <el-table-column prop="nickname"
                          label="群主"
                          header-align="center"
diff --git a/src/views/modules/group/topic-list.vue b/src/views/modules/group/topic-list.vue
index b12fa69..9e9c5dd 100644
--- a/src/views/modules/group/topic-list.vue
+++ b/src/views/modules/group/topic-list.vue
@@ -65,6 +65,14 @@
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <el-table-column label="序号" type="index" show-overflow-tooltip align="center" width="50"></el-table-column>
         <el-table-column prop="nickname" label="发言人" header-align="center" align="center" width="180" show-overflow-tooltip title="nickname"></el-table-column>
+        <el-table-column prop="dept"
+                         label="所属部门" width="180"
+                         header-align="center"
+                         align="center" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="groupName"
+                         label="社群名称" width="180"
+                         header-align="center"
+                         align="center" show-overflow-tooltip></el-table-column>
         <el-table-column prop="createdTime" label="时间" header-align="center" align="center" width="180"></el-table-column>
         <el-table-column prop="topicContent" label="话题内容" header-align="center" align="left" min-width="400"  show-overflow-tooltip title="topicContent"></el-table-column>
         <el-table-column prop="commentNum" label="评论数" header-align="center" align="center" width="100"></el-table-column>