diff --git a/src/forge/Merge/NewMerge.js b/src/forge/Merge/NewMerge.js
index 4105f9c2..6422a04c 100644
--- a/src/forge/Merge/NewMerge.js
+++ b/src/forge/Merge/NewMerge.js
@@ -228,8 +228,6 @@ class NewMerge extends Component {
return
;
};
let { project } = this.props;
- console.log("222 ",project);
- console.log("222111 ",projects_names);
return (
@@ -239,18 +237,17 @@ class NewMerge extends Component {
源分支:
@@ -266,19 +263,17 @@ class NewMerge extends Component {
目标分支:
diff --git a/src/forge/Merge/merge.css b/src/forge/Merge/merge.css
index d6a4770e..b962e886 100644
--- a/src/forge/Merge/merge.css
+++ b/src/forge/Merge/merge.css
@@ -40,4 +40,16 @@ form .ant-cascader-picker, form .ant-select {
}
.merge-header-button{
background:rgba(241,248,255,1);
+}
+.width70{
+ width:70%;
+}
+.width30{
+ width:30%;
+}
+.w120{
+ width: 120px;
+}
+.w240{
+ width: 240px;
}
\ No newline at end of file