From a1b5395b8c47b8027cc4ef02f01902b920027eaa Mon Sep 17 00:00:00 2001
From: caishi <c_15243705227@sina.com>
Date: Fri, 27 Aug 2021 14:04:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=AF=B7=E6=B1=82-=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=9D=A1=E4=BB=B6=E6=94=B9=E6=88=90user=5Fadmin=5For?=
 =?UTF-8?q?=5Fmember?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Merge/MergeItem.js | 4 ++--
 src/forge/Merge/merge.js     | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index 32f3f811..f21cc3f5 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -49,7 +49,7 @@ class MergeItem extends Component {
   };
 
   render() {
-    const { issues, project_name, project_author_name , user_admin_or_member} = this.props;
+    const { issues, project_name, project_author_name , user_admin_or_developer} = this.props;
     const { projectsId , owner } = this.props.match.params;
     const { current_user } = this.props;
     const renderList = () => {
@@ -183,7 +183,7 @@ class MergeItem extends Component {
                     ) : (
                       ""
                     )}
-                    {user_admin_or_member && item.pull_request_status === 0 ? (
+                    {user_admin_or_developer && item.pull_request_status === 0 ? (
                       <div
                         className="milepostleft"
                         style={{
diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js
index 5bb128c1..2b72cbee 100644
--- a/src/forge/Merge/merge.js
+++ b/src/forge/Merge/merge.js
@@ -4,7 +4,7 @@ import "./merge.css";
 import "../Order/order.css";
 import "../Order/index.scss";
 import NoneData from "./no_data";
-import OrderItem from "./MergeItem";
+import MergeItem from "./MergeItem";
 import './Index.scss';
 
 import axios from "axios";
@@ -387,7 +387,7 @@ class merge extends Component {
           <Spin spinning={isSpin}>
             {data && data.search_count && data.search_count > 0 ? (
               <div>
-                <OrderItem
+                <MergeItem
                   issues={issues}
                   search_count={search_count}
                   page={select_params.page}
@@ -396,8 +396,8 @@ class merge extends Component {
                   project_author_name={data.project_author_name}
                   {...this.props}
                   {...this.state}
-                  user_admin_or_member={data && data.user_admin_or_member}
-                ></OrderItem>
+                  user_admin_or_developer={data && data.user_admin_or_developer}
+                ></MergeItem>
               </div>
             ):""}
             {search_count > select_params.limit ? (