From ffc31835fb765229c420db4a651abce3f8c832fc Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 03 Sep 2021 09:47:44 +0800
Subject: [PATCH] 冲突
---
src/views/qualificationExamination/signQualificationExamination.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/views/qualificationExamination/signQualificationExamination.vue b/src/views/qualificationExamination/signQualificationExamination.vue
index ba2db1b..0c3faae 100644
--- a/src/views/qualificationExamination/signQualificationExamination.vue
+++ b/src/views/qualificationExamination/signQualificationExamination.vue
@@ -70,7 +70,7 @@
column: [
{
label: "保安姓名",
- prop: "name",
+ prop: "realName",
},
{
label: "保安公司",
--
Gitblit v1.9.3