From 33e1b7e400abdd322c1b7a57ec1d53f742bb7b75 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Tue, 30 Nov 2021 16:58:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=AF=B7=E6=B1=82-=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js
index b55f596b9..0f6f1ac81 100644
--- a/src/forge/Merge/merge.js
+++ b/src/forge/Merge/merge.js
@@ -414,7 +414,7 @@ class merge extends Component {
             ) : (
               ""
             )}
-            { data && data.issues && data.issues.length === 0 ? <NoneData _html="暂时还没有相关数据!" user_admin_or_member={data.user_admin_or_member} projectsId={projectsId} owner={owner} /> :""}
+            { data && data.issues && data.issues.length === 0 ? <NoneData _html="暂时还没有相关数据!" user_admin_or_developer={data.user_admin_or_developer} projectsId={projectsId} owner={owner} /> :""}
           </Spin>
         </div>
       </div>
diff --git a/src/forge/Merge/no_data.js b/src/forge/Merge/no_data.js
index 78a622685..76258f8ca 100644
--- a/src/forge/Merge/no_data.js
+++ b/src/forge/Merge/no_data.js
@@ -2,7 +2,7 @@ import React , { Component } from 'react';
 import { Link } from "react-router-dom";
 class Nodata extends Component{
   render(){
-    const { _html, projectsId , owner , user_admin_or_member} = this.props;
+    const { _html, projectsId , owner , user_admin_or_developer} = this.props;
     return(
       <div className="none_panels">
         <div>
@@ -12,7 +12,7 @@ class Nodata extends Component{
           <h3>欢迎使用合并请求！</h3>
         
           <div className="color-grey-8">
-          合并请求可以帮助您与他人协作编写代码。{ user_admin_or_member && <span>在使用之前，请先创建一个 <Link className="color-blue" to={`/${owner}/${projectsId}/compare/master...master`}>合并请求</Link></span> }
+          合并请求可以帮助您与他人协作编写代码。{ user_admin_or_developer && <span>在使用之前，请先创建一个 <Link className="color-blue" to={`/${owner}/${projectsId}/compare/master...master`}>合并请求</Link></span> }
           </div>
         </div>
       </div>