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/system/cs.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/views/system/cs.vue b/src/views/system/cs.vue
index 4fa9767..84ef43c 100644
--- a/src/views/system/cs.vue
+++ b/src/views/system/cs.vue
@@ -248,7 +248,7 @@
},
option: {
height: "auto",
- calcHeight: 80,
+ calcHeight: 54,
size: "mini",
tip: false,
searchShow: true,
--
Gitblit v1.9.3