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

src/modules/course-manage/video-course/components/AddVideoIntro.jsx

@@ -154,7 +154,7 @@ class AddVideoIntro extends React.Component {
           <div className="content">
             <div className="intro-list">
               <div className="intro-list__item introduce-editor">
-                {(!id || loadintroduce) &&
+                {(!id || loadintroduce) && (
                   <GraphicsEditor
                     maxLimit={1000}
                     id="intro"

src/modules/plan-manage/modal/relatedCourseModal.jsx

 /*
  * @Author: yuananting
  * @Date: 2021-07-05 10:50:10
- * @LastEditors: yuananting
- * @LastEditTime: 2021-07-13 19:55:29
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2021-07-18 10:36:14
  * @Description: 描述一下咯
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
 import React from 'react';
 import _ from 'underscore';
-import { Radio, Tabs, Modal, Input, message, Button, Tooltip } from 'antd';
+import { Table,Radio, Tabs, Modal, Input, message, Button, Tooltip } from 'antd';
 
 import { PageControl } from '@/components';