diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css
index 5279a0c4b..9b13e28ff 100644
--- a/public/css/edu-purge.css
+++ b/public/css/edu-purge.css
@@ -2658,7 +2658,7 @@ a.color-green:hover {
 
 /*百分比宽度*/
 .width100 {
-  width: 100%;
+  width: 100% !important;
 }
 
 .width89 {
diff --git a/src/forge/Merge/UpdateMerge.js b/src/forge/Merge/UpdateMerge.js
index c2c4b95c4..8ed8034af 100644
--- a/src/forge/Merge/UpdateMerge.js
+++ b/src/forge/Merge/UpdateMerge.js
@@ -37,11 +37,15 @@ class UpdateMerge extends Component {
             merge: result.data.base,
           });
         } else {
-          this.setState({ isSpin: false });
+          this.setState({
+            isSpin: false,
+          });
         }
       })
       .catch((error) => {
-        this.setState({ isSpin: false });
+        this.setState({
+          isSpin: false,
+        });
         console.log(error);
       });
   };
@@ -52,6 +56,7 @@ class UpdateMerge extends Component {
       <div>
         <div className="main">
           <Spin spinning={isSpin}>
+            {" "}
             {data ? (
               <div>
                 <div className="merge-header width100 inline-block">
@@ -66,17 +71,17 @@ class UpdateMerge extends Component {
                         defaultValue={data.is_original ? `${data.fork_project_user}:${pull}` : `${pull}`}
                         className="minW50 merge-flex1"
                         disabled
-                      ></Select>
-                    </Input.Group>
-                  </div>
+                      ></Select>{" "}
+                    </Input.Group>{" "}
+                  </div>{" "}
                   <div className="width10 pull-left text-center mt25">
                     <i
                       className={"iconfont icon-youjiang color-grey-c font-32"}
-                    ></i>
-                  </div>
+                    ></i>{" "}
+                  </div>{" "}
                   <div className="width45 pull-left">
                     <div>
-                      <div className="color-grey-3 mb10 fwb">目标分支:</div>
+                      <div className="color-grey-3 mb10 fwb"> 目标分支 : </div>{" "}
                       <Input.Group compact className="display-flex">
                         <Button className="merge-header-button  maxW50 hide-1 task-hide">
                           {`${data.project_author}/${data.project_name}`}
@@ -85,19 +90,18 @@ class UpdateMerge extends Component {
                           defaultValue={data.is_original ? `${data.project_login}:${merge}` : `${merge}`}
                           className="minW50 merge-flex1"
                           disabled
-                        ></Select>
-                      </Input.Group>
-                    </div>
-                  </div>
+                        ></Select>{" "}
+                      </Input.Group>{" "}
+                    </div>{" "}
+                  </div>{" "}
                 </div>
-
                 <MergeForm
                   {...this.props}
                   merge_type="edit"
                   data={data}
                   merge={merge}
                   pull={pull}
-                ></MergeForm>
+                ></MergeForm>{" "}
               </div>
             ) : (
               ""
diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js
index c22013a33..5389615d3 100644
--- a/src/forge/Order/Detail.js
+++ b/src/forge/Order/Detail.js
@@ -299,6 +299,7 @@ class Detail extends Component {
                   )}
               </div>
             </div>
+<<<<<<< HEAD
 
             <Comments
               order_id={orderId}
@@ -358,6 +359,79 @@ class Detail extends Component {
                 <span className="issue_detail_info">结束日期:</span>
                 <span>{data && data.due_date ? data.due_date : "--"}</span>
               </p>
+=======
+          </div>
+
+          <Comments
+            order_id={orderId}
+            showNotification={this.props.showNotification}
+            {...this.props}
+          />
+        </div>
+        <div className="list-left list-left-padding">
+          <div className="list-right-item-padding background-f boder-4">
+            <p className="grid-item-left pb15">
+              <span className="issue_detail_info">分支:</span>
+              <span>{data && data.branch_name ? data.branch_name : "--"}</span>
+            </p>
+            <p className="grid-item-left pb15">
+              <span className="issue_detail_info">是否上链:</span>
+              <span>{data && data.issue_type==="2" ? '是' : "否"}</span>
+            </p>
+            {
+              data && data.issue_type==="2" && 
+              <p  className="grid-item-left pb15">
+              <span className="issue_detail_info">token值:</span>
+              <span>{data && data.token ? data.token : "--"}</span>
+            </p>
+            }
+            <p className="grid-item-left pb15">
+              <span className="issue_detail_info">标签:</span>
+              <span>
+                {data && data.issue_tags ? (
+                  <span className="grid-item">
+                    <span
+                      className="tagColor"
+                      style={{ background: data.issue_tags[0].color }}
+                    ></span>
+                    {data.issue_tags[0].name}
+                  </span>
+                ) : (
+                  "--"
+                )}
+              </span>
+            </p>
+            <p className="grid-item-left pb15">
+              <span className="issue_detail_info">里程碑:</span>
+              <span className="title_overflow">
+                {data && data.version ? data.version : "--"}
+              </span>
+            </p>
+            <p className="grid-item-left pb15">
+              <span className="issue_detail_info">状态:</span>
+              <span>
+                {data && data.issue_status ? data.issue_status : "--"}
+              </span>
+            </p>
+            <p className="grid-item-left pb15">
+              <span className="issue_detail_info">分类:</span>
+              <span>{data && data.tracker ? data.tracker : "--"}</span>
+            </p>
+            <p className="grid-item-left pb15">
+              <span className="issue_detail_info">负责人:</span>
+              <span>
+                {data && data.assign_user_name ? data.assign_user_name : "--"}
+              </span>
+            </p>
+            <p className="grid-item-left pb15">
+              <span className="issue_detail_info">开始日期:</span>
+              <span>{data && data.start_date ? data.start_date : "--"}</span>
+            </p>
+            <p className="grid-item-left pb15">
+              <span className="issue_detail_info">结束日期:</span>
+              <span>{data && data.due_date ? data.due_date : "--"}</span>
+            </p>
+>>>>>>> f1a60781842ca7e33708fbad16036d58ce84e5bc
 
               <p className="grid-item-left pb15">
                 <span className="issue_detail_info">完成度:</span>
diff --git a/src/forge/Order/order_form.js b/src/forge/Order/order_form.js
index 2265642d1..2e79b3193 100644
--- a/src/forge/Order/order_form.js
+++ b/src/forge/Order/order_form.js
@@ -34,6 +34,8 @@ class order_form extends Component {
       subject: "",
       get_attachments: undefined,
       show_token: false,
+      cannot_edit: false,
+      issue_current_user: true
     };
   }
   componentDidUpdate=(prevPros)=>{
@@ -263,6 +265,7 @@ class order_form extends Component {
       });
       this.setState({
         done_ratio: "0",
+        issue_current_user: true,
       });
     } else if (e === "3") {
       this.props.form.setFieldsValue({
@@ -270,6 +273,11 @@ class order_form extends Component {
       });
       this.setState({
         done_ratio: "100",
+        issue_current_user: true,
+      });
+    }else if (e === "5") {
+      this.setState({
+        issue_current_user: false,
       });
     }
   };
diff --git a/src/forge/Settings/Collaborator.js b/src/forge/Settings/Collaborator.js
index 049e3dae5..3d7da85b8 100644
--- a/src/forge/Settings/Collaborator.js
+++ b/src/forge/Settings/Collaborator.js
@@ -360,6 +360,11 @@ class Collaborator extends Component {
         dataIndex: "email",
         render: (text) => <span>{text}</span>,
       },
+      {
+        title: "Token值",
+        dataIndex: "token",
+        render: (text) => <span>{text}</span>,
+      },
       {
         title: roleTitle,
         dataIndex: "role_name",