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/dispatch/data.js |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/views/dispatch/data.js b/src/views/dispatch/data.js
index 606e4f3..b807b64 100644
--- a/src/views/dispatch/data.js
+++ b/src/views/dispatch/data.js
@@ -14,6 +14,7 @@
         prop: "name",
         search: true,
         searchLabelWidth: 110,
+        searchSpan: 4,
         // span: 12,
         labelWidth: 110,
     },
@@ -54,7 +55,7 @@
         // addDisplay: true,
         // editDisplay: true,
         // viewDisplay: true,
-        // searchSpan: 5,
+        // searchSpan: 4,
         // dicUrl: "/api/blade-system/dict-biz/dictionary?code=experienceType",
         // props: {
         //     label: "dictValue",

--
Gitblit v1.9.3