From fba4c7a123119a296ad38bbe4db16d9e9d8af5aa Mon Sep 17 00:00:00 2001
From: liuchuang <m18800112042_2@163.com>
Date: Tue, 3 Dec 2019 20:16:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E7=BE=A4=E6=A8=A1=E5=9D=97=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=89=80=E5=B1=9E=E7=BD=91=E6=A0=BC=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/group/leaderboard.vue  | 4 ++--
 src/views/modules/group/topic-detail.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/group/leaderboard.vue b/src/views/modules/group/leaderboard.vue
index 8ae31ce5..fb83ca51 100644
--- a/src/views/modules/group/leaderboard.vue
+++ b/src/views/modules/group/leaderboard.vue
@@ -44,13 +44,13 @@
       <el-table v-if="this.orderType === '0'" 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="groupName" label="群名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="ownGrid" label="所属网格" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="allDeptNames" label="所属网格" header-align="center" align="center"></el-table-column>
       </el-table>
       <el-table v-if="this.orderType === '1'" 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="groupName" label="群名" header-align="center" align="center"></el-table-column>
         <el-table-column prop="memberNum" label="群成员数量" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="ownGrid" label="所属网格" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="allDeptNames" label="所属网格" header-align="center" align="center"></el-table-column>
       </el-table>
       <el-pagination
         :current-page="page"
diff --git a/src/views/modules/group/topic-detail.vue b/src/views/modules/group/topic-detail.vue
index b16deaf5..b26f744c 100644
--- a/src/views/modules/group/topic-detail.vue
+++ b/src/views/modules/group/topic-detail.vue
@@ -15,7 +15,7 @@
                         </el-image>
                     </el-form-item>
                     <el-form-item label="地址:" prop="ownGrid">
-                        <div>{{dataForm.topicAddress}}</div>
+                        <div>{{dataForm.allDeptNames}}</div>
                     </el-form-item>
                     <el-form-item label="议题来源:" prop="createdTime">
                         <div>{{dataForm.groupName}}</div>