From c181527b88758cec56479f2076f06c8df9dd45c6 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期一, 30 五月 2022 15:11:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 src/views/contractor/blackList/index.vue |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/contractor/blackList/index.vue b/src/views/contractor/blackList/index.vue
index ceec0ad..9d5860b 100644
--- a/src/views/contractor/blackList/index.vue
+++ b/src/views/contractor/blackList/index.vue
@@ -22,9 +22,9 @@
                 <el-table-column type="index" label="序号" align="center" width="60"/>
                 <el-table-column label="单位名称" prop="company" align="center">
                 </el-table-column>
-                <el-table-column label="创建人" prop="code" align="center">
+                <el-table-column label="创建人" prop="createdby" align="center">
                 </el-table-column>
-                <el-table-column label="创建时间" prop="contactname" align="center">
+                <el-table-column label="创建时间" prop="createdat" align="center">
                 </el-table-column>
                 <el-table-column label="操作" align="center" width="280" class-name="small-padding fixed-width">
                     <template slot-scope="scope">
@@ -54,7 +54,7 @@
                 </el-form-item>
             </el-form>
             <div  align="right">
-                <el-button @click="unitFormVisible = false">取消</el-button>
+                <el-button @click="blackFormVisible = false">取消</el-button>
                 <el-button type="primary" @click="submitUnit()">确认</el-button>
             </div>
         </el-dialog>

--
Gitblit v1.9.2