From cc2dd35ff42129002dcf1979753443820941638e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Wed, 10 Nov 2021 20:45:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=90=88=E5=B9=B6=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E6=9C=80=E5=90=8E=E4=B8=80=E8=A1=8C@=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86=E8=A2=AB=E9=81=AE=E6=8C=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Merge/UpdateMerge.js | 2 +-
 src/forge/Merge/merge.css      | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/forge/Merge/UpdateMerge.js b/src/forge/Merge/UpdateMerge.js
index 8918db6e..8af84941 100644
--- a/src/forge/Merge/UpdateMerge.js
+++ b/src/forge/Merge/UpdateMerge.js
@@ -54,7 +54,7 @@ class UpdateMerge extends Component {
     const { data, isSpin, pull, merge } = this.state;
     return (
       <div>
-        <div className="main">
+        <div className="main updateMerge">
           <Spin spinning={isSpin}>
             {" "}
             {data ? (
diff --git a/src/forge/Merge/merge.css b/src/forge/Merge/merge.css
index d61543b4..0ac43c7d 100644
--- a/src/forge/Merge/merge.css
+++ b/src/forge/Merge/merge.css
@@ -222,4 +222,8 @@ form .ant-cascader-picker, form .ant-select {
  .overlihide li{
   max-width: 450px;
   
+ }
+ /* 距离底部加大 @列表被遮挡 */
+ .updateMerge{
+   margin: 30px auto 60px;
  }
\ No newline at end of file