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 ? :""} + { data && data.issues && data.issues.length === 0 ? :""} 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(
@@ -12,7 +12,7 @@ class Nodata extends Component{

欢迎使用合并请求!

- 合并请求可以帮助您与他人协作编写代码。{ user_admin_or_member && 在使用之前,请先创建一个 合并请求 } + 合并请求可以帮助您与他人协作编写代码。{ user_admin_or_developer && 在使用之前,请先创建一个 合并请求 }