From 9b5c499b0a00994d5d40b0ef099e3790f3a2b0ee Mon Sep 17 00:00:00 2001
From: ljlong_2630 <ljlong_2630@yeah.net>
Date: Fri, 1 Sep 2023 16:29:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/self-defined.scss | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/assets/styles/self-defined.scss b/src/assets/styles/self-defined.scss
index f53878f..7f20b52 100644
--- a/src/assets/styles/self-defined.scss
+++ b/src/assets/styles/self-defined.scss
@@ -29,6 +29,10 @@
     margin-bottom: 5px;
 }
 
+.marginbottom5{
+    margin-bottom: 5px;
+}
+
 .textaligncenter{
     text-align:center;
 }
@@ -55,6 +59,7 @@
     margin-top:10px;
 }
 
+<<<<<<< Updated upstream
 .el-step__icon {
     position: relative;
     z-index: 1;
@@ -85,12 +90,15 @@
     width: 0;
     height: 0;
   }
+=======
+>>>>>>> Stashed changes
 .divsonmarginleft0{
     div{
         margin-left:0 !important;
     }
 }
 
+<<<<<<< Updated upstream
 
 
 .marginbottom{
@@ -176,3 +184,8 @@
     display: block;
 }
 
+=======
+.marginbottom{
+    margin-bottom: 0 !important;
+}
+>>>>>>> Stashed changes