From ff066fb8d926d9a75efdcfdfc1b37f890cd98d82 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 14 Aug 2021 16:02:39 +0800
Subject: [PATCH] 解决冲突

---
 src/views/securityUnitChild/data.js |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/views/securityUnitChild/data.js b/src/views/securityUnitChild/data.js
index 7c4e691..452ca96 100644
--- a/src/views/securityUnitChild/data.js
+++ b/src/views/securityUnitChild/data.js
@@ -42,7 +42,7 @@
         disabled: true,
     },
     {
-        label: "成立日期",
+        label: "注册时间",
         prop: "establishtime",
         span: 11,
         labelWidth: 130,
@@ -155,6 +155,7 @@
     }, {
         label: "股东",
         prop: "shareholder",
+        searchLabelWidth: 55,
         search: true,
         labelWidth: w,
         span: s,
@@ -224,6 +225,7 @@
         prop: "name",
         search: true,
         labelWidth: w,
+        searchLabelWidth: 55,
         span: s,
     }, {
         label: "职务",

--
Gitblit v1.9.3