bug fix

src/view/Manage/Model/Component/merge-to-master.jsx

@@ -8,7 +8,7 @@ import VersionCompareIndex from './VersionCompareIndex'
 import { defaultColumnTitles } from './VersionCompare'
 import FilterColumnAction from './FilterColumnAction'
 
-import '../../AssetManage/add-resources.less'
+import './merge-to-master.less'
 import './VersionCompare.less'
 
 const FC = (props) => {
@@ -50,7 +50,7 @@ const FC = (props) => {
 
   return (
     <Modal
-      className='add-resources'
+      className='merge-to-master'
       visible={visible}
       footer={footer}
       width='80%'

src/view/Manage/Model/Component/merge-to-master.less

+.merge-to-master {
+  .tree {
+    height: calc(80vh - 30px);
+    overflow: auto;
+  }
+
+  .yy-tree-switcher {
+    width: 0 !important;
+  }
+}
\ No newline at end of file