From 3806a5dd8df54a130da1a5b57f2fc265ffa72ec0 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 13 Apr 2023 15:58:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=AF=B7=E6=B1=82-=E5=88=86?=
 =?UTF-8?q?=E6=94=AF=E9=9C=80=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/AppConfig.js               | 2 +-
 src/forge/Merge/CreateMerge.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/AppConfig.js b/src/AppConfig.js
index fbc327da1..24f066563 100644
--- a/src/AppConfig.js
+++ b/src/AppConfig.js
@@ -25,7 +25,7 @@ if (isDev) {
   }
   debugType = window.location.search.indexOf('debug=t') !== -1 ? 'teacher' :
   window.location.search.indexOf('debug=s') !== -1 ? 'student' :
-  window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'student'
+  window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'admin'
 }                 
 window._debugType = debugType;
 export function initAxiosInterceptors(props) {
diff --git a/src/forge/Merge/CreateMerge.js b/src/forge/Merge/CreateMerge.js
index 28ed7690f..86ddc392b 100644
--- a/src/forge/Merge/CreateMerge.js
+++ b/src/forge/Merge/CreateMerge.js
@@ -151,8 +151,8 @@ class CreateMerge extends Component {
 
   checkBranch=async(branchParams)=>{
     const { mergeBranch , mergeOwner, projectId , pullBranch ,pullOwner} = branchParams;
-    let getbranch =await this.getBranchList(mergeOwner,projectId,pullBranch,mergeBranch,"merge");
-    let checkpull =await this.getBranchList(pullOwner,projectId,pullBranch,mergeBranch,"pull");
+    let getbranch =await this.getBranchList(mergeOwner,projectId,returnbar(pullBranch),returnbar(mergeBranch),"merge");
+    let checkpull =await this.getBranchList(pullOwner,projectId,returnbar(pullBranch),returnbar(mergeBranch),"pull");
     if(getbranch && checkpull){
       this.compareProject(mergeOwner === pullOwner, branchParams,1);
     }else{