From 10360c3e3731b55a9eae341c90f49b0d7b596d4d Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Sun, 8 Oct 2023 10:12:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=AF=B7=E6=B1=82=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Merge/merge.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js
index 237a07338..d8d83e155 100644
--- a/src/forge/Merge/merge.js
+++ b/src/forge/Merge/merge.js
@@ -407,7 +407,7 @@ class merge extends Component {
             </li>
           </ul>
         </div>
-        <div style={{minHeight:"470px"}}>
+        <div style={{minHeight:"470px",paddingBottom:"50px"}}>
           <Spin spinning={isSpin}>
             {data && data.search_count && data.search_count > 0 ? (
               <div className="mergeData">
@@ -427,7 +427,7 @@ class merge extends Component {
               </div>
             ):""}
             {search_count > select_params.limit ? (
-              <div className="mt30 mb50 edu-txt-center">
+              <div className="mt30 edu-txt-center">
                 <Pagination
                   simple
                   current={select_params.page}