From 7c4b47852e921718259c3e27421f44f8d2edb7fc Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Mon, 26 Apr 2021 16:45:52 +0800
Subject: [PATCH] 冲突合并
---
src/views/clientManagement/clientManagement_copy.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/views/clientManagement/clientManagement_copy.vue b/src/views/clientManagement/clientManagement_copy.vue
index bb24e5e..808f5e7 100644
--- a/src/views/clientManagement/clientManagement_copy.vue
+++ b/src/views/clientManagement/clientManagement_copy.vue
@@ -234,7 +234,7 @@
option: {
height: 'auto',
indexLabel: '序号',
- calcHeight: 80,
+ calcHeight: 54,
labelWidth: '100',
dialogWidth: 950,
menuWidth: 250,
--
Gitblit v1.9.3