From e434c72ecb3d99e2bd8b4113998940034b0000be Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 26 Apr 2021 11:41:37 +0800
Subject: [PATCH] 冲突解决

---
 src/views/clientManagement/clientManagement.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index a3ed6d4..30eaffe 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -269,7 +269,7 @@
         option: {
           height: 'auto',
           indexLabel: '序号',
-          calcHeight: 80,
+          calcHeight: 54,
           labelWidth: '125',
           dialogWidth: 1150,
           menuWidth: 150,

--
Gitblit v1.9.3