diff --git a/src/forge/Images/taskbar.png b/src/forge/Images/taskbar.png
new file mode 100644
index 000000000..91ceec7f2
Binary files /dev/null and b/src/forge/Images/taskbar.png differ
diff --git a/src/forge/Main/sub/DetailBanner.jsx b/src/forge/Main/sub/DetailBanner.jsx
index 7ed723c78..bb298aa17 100644
--- a/src/forge/Main/sub/DetailBanner.jsx
+++ b/src/forge/Main/sub/DetailBanner.jsx
@@ -48,7 +48,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                     item.menu_name === "issues" &&
                     <li className={pathname==="issues" ? "active" : ""}>
                         <Link to={{ pathname: `/${owner}/${projectsId}/issues`, state }}>
-                          <Tooltip title="易修是Issue的中文名，即问题列表" placement="bottom">
+                          <Tooltip placement="bottom">
                               <i className={"iconfont icon-yixiuicon1 color-grey-3 mr5 font-14"}></i>
                               <span>易修(Issue)</span>
                           </Tooltip>
diff --git a/src/forge/Team/Group/GroupDetails.jsx b/src/forge/Team/Group/GroupDetails.jsx
index ba5693865..1122ce724 100644
--- a/src/forge/Team/Group/GroupDetails.jsx
+++ b/src/forge/Team/Group/GroupDetails.jsx
@@ -117,8 +117,8 @@ export default ((props) => {
               </AlignCenterBetween>
               <div className="g-desc">{group.description ? group.description : "暂无描述"}</div>
               <div className="g-tip">
-                <p>管理员团队对 <span>所有仓库</span> 具有操作权限，且对组织具有 <span>管理员权限</span>。 </p>
-                <p>此外，该团队拥有了 <span>创建仓库</span>  的权限：成员可以在组织中创建新的仓库。 </p>
+                <p>组织的Owner团队拥有更改组织设置，在组织内新建仓库，新建组织团队等权限。</p>
+                <p>此外，Owner团队成员对当前组织下所有项目均具有仓库管理员权限，组织下其他团队的权限可由Owner团队成员自由制定。</p>
                 {group.is_admin ? <Button type="primary" onClick={()=>props.history.push(`/${OIdentifier}/teams/${groupId}/setting`)}><span className="color-white">团队设置</span></Button> : ""}
               </div>
             </div>
diff --git a/src/forge/css/index.scss b/src/forge/css/index.scss
index d529a2193..9ff62ada6 100644
--- a/src/forge/css/index.scss
+++ b/src/forge/css/index.scss
@@ -4,6 +4,13 @@ ul,ol,dl{
 .newMain{
   background-color: #fff;
 }
+.newTable{
+  background-color: #F0F5FF;
+  .newImages{
+    background-image: url('../../forge/Images/taskbar.png');
+    height: 364px;
+  }
+}
 .color-black{
   color: #333;
 }
diff --git a/src/modules/403/Shixunauthority.js b/src/modules/403/Shixunauthority.js
index 835eb2a6f..3807262d9 100644
--- a/src/modules/403/Shixunauthority.js
+++ b/src/modules/403/Shixunauthority.js
@@ -1,10 +1,27 @@
+<<<<<<< HEAD
 import React, { Component } from 'react';
+=======
+import React, { Component, useReducer } from 'react';
+
+import { BrowserRouter as Router, Route, Link, Switch } from "react-router-dom";
+
+import Loading from '../../Loading';
+
+import Loadable from 'react-loadable';
+
+>>>>>>> develop
 import { TPMIndexHOC } from '../tpm/TPMIndexHOC';
 import { SnackbarHOC, getImageUrl } from 'educoder';
 
 class Shixunauthority extends Component {
+    constructor(props) {
+        super(props);
+    }
     render() {
+        console.log(this.props);
+        const { current_user } = this.props;
         return (
+<<<<<<< HEAD
             <div className="newMain clearfix">
                 <div className=" edu-txt-center mt60 mb60">
                     <img src={getImageUrl("images/warn/pic_403.jpg")} alt="" />
@@ -15,9 +32,35 @@ class Shixunauthority extends Component {
                             className="color-blue">QQ反馈&gt;&gt;</a>
                     </p>
                 </div>
+=======
+            <div className="newMain newTable clearfix">
+                    <div className="edu-txt-center mt60 mb60">
+                        {/*mt100 mb100*/}
+                        <img src={getImageUrl("images/warn/pic_403.jpg")} />
+                            <p className="font-16 mt56 newImages">
+                            <p>您尚未被授权访问此页面，请先获取相关权限</p>
+                                您可尝试
+                                {(!current_user || !current_user.login) && (
+                                    <p style={{display:"inline"}}>您可尝试<a href="//testforgeplus.trustie.net/login" className="color-blue">登录</a>或</p>
+                                )}
+                                <a href="/"
+                                                className="color-blue">返回首页</a>，也可以通过
+                                <a target="_blank"
+                                   href="https://qm.qq.com/cgi-bin/qm/qr?k=YVGUhY7uK8ovpyd7tG_lHe2qGZ63LOij&jump_from=webapi"
+                                   className="color-blue">QQ</a>向我们反馈
+                            </p>                      
+                    </div>
+                    {/*<div style="clear:both;"></div>*/}
+                    {/*<div id="ajax-indicator" style="display:none;"><span>载入中...</span></div>*/}
+                    {/*<div id="ajax-modal" style="display:none;"></div>*/}
+>>>>>>> develop
             </div>
         );
     }
 }
+<<<<<<< HEAD
 
 export default SnackbarHOC()(TPMIndexHOC(Shixunauthority));
+=======
+export default SnackbarHOC() (TPMIndexHOC  ( Shixunauthority ));
+>>>>>>> develop
diff --git a/src/modules/404/Shixunnopage.js b/src/modules/404/Shixunnopage.js
index 8a0bc16e8..7acfcae85 100644
--- a/src/modules/404/Shixunnopage.js
+++ b/src/modules/404/Shixunnopage.js
@@ -3,8 +3,14 @@ import { TPMIndexHOC } from '../tpm/TPMIndexHOC';
 import { SnackbarHOC, getImageUrl } from 'educoder';
 
 class http500 extends Component {
+    constructor(props) {
+        super(props);
+    }
     render() {
+        console.log(this.props);
+        const { current_user } = this.props;
         return (
+<<<<<<< HEAD
             <div className="newMain clearfix">
                 <div className=" edu-txt-center mt60 mb60">
                     <img src={getImageUrl("/images/warn/pic_404.jpg")} alt="" />
@@ -15,6 +21,29 @@ class http500 extends Component {
                             className="color-blue">QQ反馈&gt;&gt;</a>
                     </p>
                 </div>
+=======
+            <div className="newMain newTable clearfix">
+                    <div className=" edu-txt-center mt60">
+                        {/*mt100 mb100*/}
+                        <img src={getImageUrl("/images/warn/pic_404.jpg")} />
+                            <p className="font-16 mt56 newImages">
+                                <p>你访问的页面不存在</p>
+                                您可尝试
+                                {(!current_user || !current_user.login) && (
+                                    <p style={{display:"inline"}}>您可尝试<a href="//testforgeplus.trustie.net/login" className="color-blue">登录</a>或</p>
+                                )}
+                                <a href="/"
+                                                className="color-blue">返回首页</a>
+                                ，也可通过
+                                <a target="_blank"
+                                   href="https://qm.qq.com/cgi-bin/qm/qr?k=YVGUhY7uK8ovpyd7tG_lHe2qGZ63LOij&jump_from=webapi"
+                                   className="color-blue">QQ</a>向我们反馈
+                            </p>
+                    </div>
+                    {/*<div style="clear:both;"></div>*/}
+                    {/*<div id="ajax-indicator" style="display:none;"><span>载入中...</span></div>*/}
+                    {/*<div id="ajax-modal" style="display:none;"></div>*/}
+>>>>>>> develop
             </div>
         );
     }
diff --git a/src/modules/500/http500.js b/src/modules/500/http500.js
index b27c44b3c..5cb60a8f8 100644
--- a/src/modules/500/http500.js
+++ b/src/modules/500/http500.js
@@ -4,6 +4,7 @@ import { SnackbarHOC, getImageUrl } from 'educoder';
 class Shixunnopage extends Component {
     render() {
         return (
+<<<<<<< HEAD
             <div className="newMain clearfix">
                 <div className=" edu-txt-center mt60 mb60">
                     <img src={getImageUrl("images/warn/pic_500.jpg")} alt="" />
@@ -14,6 +15,25 @@ class Shixunnopage extends Component {
                             className="color-blue">QQ反馈&gt;&gt;</a>
                     </p>
                 </div>
+=======
+            <div className="newMain newTable clearfix">
+                    <div className=" edu-txt-center mt60 mb60">
+                        {/*mt100 mb100*/}
+                        <img src={getImageUrl("images/warn/pic_500.jpg")} />
+                            <p className="font-16 mt56 newImages">
+                                <p>服务器异常，请稍后重试</p>
+                                您可尝试<a href="javascript:location.reload();" className="color-blue">刷新页面</a>或<a href="/"
+                                                className="color-blue">返回首页</a>
+                                ，也可以通过
+                                <a target="_blank"
+                                   href="https://qm.qq.com/cgi-bin/qm/qr?k=YVGUhY7uK8ovpyd7tG_lHe2qGZ63LOij&jump_from=webapi"
+                                   className="color-blue">QQ</a>向我们反馈
+                            </p>
+                    </div>
+                    {/*<div style="clear:both;"></div>*/}
+                    {/*<div id="ajax-indicator" style="display:none;"><span>载入中...</span></div>*/}
+                    {/*<div id="ajax-modal" style="display:none;"></div>*/}
+>>>>>>> develop
             </div>
         );
     }