From 81e16742530ddcd86b368678bad74fc8eb471c63 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 28 十月 2024 18:44:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into test

---
 src/views/user/admin/list.vue |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/views/user/admin/list.vue b/src/views/user/admin/list.vue
index 31a6b46..d36e14a 100644
--- a/src/views/user/admin/list.vue
+++ b/src/views/user/admin/list.vue
@@ -16,6 +16,14 @@
       <el-table-column prop="userName" label="鐢ㄦ埛鍚�"/>
       <el-table-column prop="realName" label="鐪熷疄濮撳悕" />
       <el-table-column prop="sex" label="鎬у埆" width="60px;" :formatter="sexFormatter"/>
+      <el-table-column label="鐝骇">
+        <template slot-scope="scope">
+        <span v-if="Array.isArray(scope.row.className) && scope.row.className.length > 0">
+          {{ scope.row.className.join(', ') }}
+        </span>
+          <span v-else>-</span>
+        </template>
+      </el-table-column>
       <el-table-column prop="phone" label="鎵嬫満鍙�"/>
       <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" width="160px"/>
       <el-table-column label="鐘舵��" prop="status" width="70px">

--
Gitblit v1.8.0