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/tenant.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/views/system/tenant.vue b/src/views/system/tenant.vue
index 702f8c4..d0eb9ad 100644
--- a/src/views/system/tenant.vue
+++ b/src/views/system/tenant.vue
@@ -89,7 +89,7 @@
       },
       option: {
         height: 'auto',
-        calcHeight: 30,
+        calcHeight: 54,
         tip: false,
         searchShow: true,
         searchMenuSpan: 6,

--
Gitblit v1.9.3