From d4acc07a28e2bbeb25f097148bbbfe4b3356b9f9 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 27 二月 2024 14:36:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/deviceEvent.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/business/deviceEvent.vue b/admin/src/views/business/deviceEvent.vue
index f055fb4..6230072 100644
--- a/admin/src/views/business/deviceEvent.vue
+++ b/admin/src/views/business/deviceEvent.vue
@@ -60,9 +60,9 @@
<span v-if="row.userType === 2">鍐呴儴浜哄憳</span>
</template>
</el-table-column>
- <el-table-column prop="name" label="濮撳悕" min-width="100px"></el-table-column>
- <el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="idcard" label="韬唤璇佸彿鐮�" min-width="100px"></el-table-column>
+ <el-table-column prop="personName" label="濮撳悕" min-width="100px"></el-table-column>
+ <el-table-column prop="personPhone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
+ <el-table-column prop="personIdcardDecode" label="璇佷欢鍙�" min-width="100px"></el-table-column>
<el-table-column prop="personCompanyName" label="鍏徃/缁勭粐" min-width="100px"></el-table-column>
<el-table-column prop="devName" label="闂ㄧ鍚嶇О" min-width="100px"></el-table-column>
<el-table-column prop="srcName" label="闂ㄧ鐐�" min-width="100px"></el-table-column>
--
Gitblit v1.9.3