fix:解决冲突

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

@@ -2,13 +2,13 @@
  * @Author: 吴文洁
  * @Author: 吴文洁
  * @Date: 2020-08-05 10:12:45
  * @Date: 2020-08-05 10:12:45
  * @LastEditors: wufan
  * @LastEditors: wufan
- * @LastEditTime: 2021-05-30 20:36:15
+ * @LastEditTime: 2021-05-30 20:53:07
  * @Description: 视频课-列表模块
  * @Description: 视频课-列表模块
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  */
  */
 import React from 'react';
 import React from 'react';
 import { Table, Modal, message , Tooltip,Switch,Dropdown} from 'antd';
 import { Table, Modal, message , Tooltip,Switch,Dropdown} from 'antd';
-
+import { PageControl } from "@/components";
 import ShareLiveModal from "@/modules/course-manage/modal/ShareLiveModal"
 import ShareLiveModal from "@/modules/course-manage/modal/ShareLiveModal"
 import WatchDataModal from "../modal/WatchDataModal"
 import WatchDataModal from "../modal/WatchDataModal"
 import CourseService from "@/domains/course-domain/CourseService"
 import CourseService from "@/domains/course-domain/CourseService"

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

@@ -2,7 +2,6 @@
   .ant-tabs-tab.ant-tabs-tab-active .ant-tabs-tab-btn {
   .ant-tabs-tab.ant-tabs-tab-active .ant-tabs-tab-btn {
     font-weight: 500;
     font-weight: 500;
   }
   }
-
     .link-create-course{
     .link-create-course{
         color:#666666;
         color:#666666;
         font-size:14px;
         font-size:14px;
@@ -53,7 +52,6 @@
           font-size:14px;
           font-size:14px;
         } 
         } 
   }
   }
-  }
   .search-container {
   .search-container {
     margin-bottom: 16px;
     margin-bottom: 16px;
   }
   }