From d259b1057c34d980d88ba8c852fde2beba8899d8 Mon Sep 17 00:00:00 2001
From: bjang03 <259278618@qq.com>
Date: Sat, 14 Sep 2024 09:07:14 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E5=8F=AA=E6=9C=89MASTER=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8F=AF=E4=BB=A5=E6=98=BE=E7=A4=BA=E8=A7=A3?=
 =?UTF-8?q?=E5=86=BB=E6=8C=89=E9=92=AE=202=E3=80=81=E6=9B=B4=E6=8D=A2?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E9=9A=BE=E5=BA=A6=E6=97=B6=E4=B8=8B=E6=96=B9?=
 =?UTF-8?q?=E7=BB=99=E5=87=BA=E5=AF=86=E7=A0=81=E8=A7=84=E5=88=99=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=202=E3=80=81=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?=
 =?UTF-8?q?=E6=97=B6=E6=97=A7=E5=AF=86=E7=A0=81=E6=A0=A1=E9=AA=8C=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5=E6=96=87=E6=A1=88=E4=BF=AE=E6=94=B9=204=E3=80=81?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E5=A2=9E=E5=8A=A0=E5=86=BB?=
 =?UTF-8?q?=E7=BB=93=E5=88=B0=E6=9C=9F=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 2b2020f8a..95bc451c5 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -58,6 +58,7 @@
           <el-table-column label="用户昵称" align="center" prop="nickname" :show-overflow-tooltip="true" />
           <el-table-column label="部门" align="center" key="deptName" prop="dept.name" :show-overflow-tooltip="true" />
           <el-table-column label="手机号码" align="center" prop="mobile" width="120" />
+          <el-table-column label="冻结到期时间" align="center" prop="frozenEndTime" :formatter="dateFormatter" width="180" />
           <el-table-column label="状态" align="center" key="status">
             <template #default="scope">
               <el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1"