From a04b8de39eb0b72a2e014d337e381f67e7d06fbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Tue, 23 Nov 2021 10:13:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=B7=E6=96=B0=E5=90=88=E5=B9=B6=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E9=A1=B5=E9=9D=A2=E4=B9=8B=E5=90=8E=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=AF=B7=E6=B1=82=E6=8A=A5=E9=94=99=EF=BC=88?=
 =?UTF-8?q?=E6=81=A2=E5=A4=8D2.0=E7=89=88=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/forge/Merge/CreateMerge.js b/src/forge/Merge/CreateMerge.js
index f365fd484..7b676cb46 100644
--- a/src/forge/Merge/CreateMerge.js
+++ b/src/forge/Merge/CreateMerge.js
@@ -123,10 +123,8 @@ class CreateMerge extends Component {
             const initUser = result.data.projects_names && result.data.projects_names.filter((item)=>item.project_user_login === branchParams.mergeOwner);
             initUser && initUser[0] && this.selectProjectName(initUser[0].id,false,{projects_names: result.data.projects_names,id: result.data.id});
           }
-          setTimeout(()=>{
-            this.setState({isSpin: false});
-            console.log('setTimeout  state', this.state.data);
-          },0)
+          this.setState({isSpin: false});
+          console.log('setTimeout  state', this.state.data);
           // 如果url上的分支不存在，取默认值master
           const noMergeBranch =
             (result.data.branches || []).filter(