From 17bed3a7f7e90b23afb5def223fd7a285ff6cc24 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 10 Aug 2021 08:40:56 +0800
Subject: [PATCH] 冲突

---
 src/styles/element-ui.scss |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 3deeb9c..be569e2 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -421,3 +421,12 @@
   background-color: transparent !important;
   border-bottom: 1px solid $mainB !important;
 }
+//菜单scroll
+.menuClass .el-card{
+  height: auto !important;
+}
+
+//机构管理
+.deptClass .el-card{
+  height: auto !important;
+}

--
Gitblit v1.9.3