feat:解决合并代码后的冲突

src/index.html

@@ -2,7 +2,7 @@
  * @Author: 吴文洁
  * @Date: 2020-08-24 12:20:57
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-07-19 15:48:51
+ * @LastEditTime: 2021-08-02 17:00:14
  * @Description: 
  * @Copyright: 杭州杰竞科技有限公司 版权所有
 -->
@@ -25,14 +25,14 @@
     <!-- <link rel="shortcut icon" href="https://image.xiaomaiketang.com/xm/c4KiP2epBP.png" /> -->
     <!-- <link rel="shortcut icon" href="https://image.xiaomaiketang.com/xm/WGWCtxiGzE.png"> -->
 
-    <!--
+		<!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-    <link rel="stylesheet" href="//at.alicdn.com/t/font_2223403_oe5p510553.css" />
+		<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
+		<link rel="stylesheet" href="//at.alicdn.com/t/font_2223403_oe5p510553.css" />
 
-    <!--
+		<!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
       Only files inside the `public` folder can be referenced from the HTML.
@@ -55,7 +55,7 @@
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
 
-    <!--
+		<!--
       This HTML file is a template.
       If you open it directly in the browser, you will see an empty page.
 
@@ -65,5 +65,5 @@
       To begin the development, run `npm start` or `yarn start`.
       To create a production bundle, use `npm run build` or `yarn build`.
     -->
-  </body>
+	</body>
 </html>

src/modules/resource-disk/modal/ScanFileModal.jsx

@@ -34,7 +34,7 @@ class ScanFileModal extends React.Component {
               style={{ width: 632, objectFit: "cover" }}
             />
           )}
-          {fileType === "VIDEO" && (
+          {(fileType ==="VIDEO" || fileType === "MP4") && (
             <div>
               <Player
                 src={item.mediaUrl || item.ossAddress || item.ossUrl}

src/modules/teach-tool/components/CourseCategorySiderTree.less

@@ -30,7 +30,7 @@
       text-align: center;
       margin-top: 100%;
       .empty-tree-btn {
-        color: #2966FF;
+        color: #2966ff;
         cursor: pointer;
       }
     }
@@ -39,8 +39,6 @@
       font-weight: 400;
       color: #666666;
       width: 234px;
-      // overflow-x: scroll;
-      // overflow-y: hidden;
       .anticon {
         color: #999999;
       }
@@ -52,7 +50,7 @@
           white-space: nowrap;
         }
         .ant-tree-node-content-wrapper.ant-tree-node-selected {
-          color: #2966FF;
+          color: #2966ff;
         }
       }
       .ant-tree-treenode-selected:hover::before,