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

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

@@ -2,16 +2,17 @@
  * @Author: yuananting
  * @Author: yuananting
  * @Date: 2021-07-05 10:50:10
  * @Date: 2021-07-05 10:50:10
  * @LastEditors: Please set LastEditors
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-07-18 10:36:14
+ * @LastEditTime: 2021-07-18 10:50:16
  * @Description: 描述一下咯
  * @Description: 描述一下咯
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
  */
 import React from 'react';
 import React from 'react';
 import _ from 'underscore';
 import _ from 'underscore';
-import { Table,Radio, Tabs, Modal, Input, message, Button, Tooltip } from 'antd';
+import { Radio, Tabs, Modal, Input, message, Button, Tooltip } from 'antd';
 
 
-import { PageControl } from '@/components';
+import { PageControl, XMTable } from '@/components';
+import college from '@/common/lottie/college';
 
 
 import CourseService from '@/domains/course-domain/CourseService';
 import CourseService from '@/domains/course-domain/CourseService';
 import User from '@/common/js/user';
 import User from '@/common/js/user';
@@ -732,7 +733,11 @@ class SelectOperatorModal extends React.Component {
                 </div>
                 </div>
               </div>
               </div>
               <div>
               <div>
-                <Table
+                <XMTable
+                  renderEmpty={{
+                    image: college,
+                    description: '暂无数据',
+                  }}
                   rowKey={(record) => record.liveCourseId}
                   rowKey={(record) => record.liveCourseId}
                   dataSource={liveDataSource}
                   dataSource={liveDataSource}
                   columns={this.parseLiveColumns()}
                   columns={this.parseLiveColumns()}
@@ -824,7 +829,11 @@ class SelectOperatorModal extends React.Component {
                 </div>
                 </div>
               </div>
               </div>
               <div>
               <div>
-                <Table
+                <XMTable
+                  renderEmpty={{
+                    image: college,
+                    description: '暂无数据',
+                  }}
                   rowKey={(record) => record.id}
                   rowKey={(record) => record.id}
                   dataSource={videoDataSource[videoCourseDivision]}
                   dataSource={videoDataSource[videoCourseDivision]}
                   columns={this.parseVideoColumns()}
                   columns={this.parseVideoColumns()}
@@ -929,7 +938,11 @@ class SelectOperatorModal extends React.Component {
                 </div>
                 </div>
               </div>
               </div>
               <div>
               <div>
-                <Table
+                <XMTable
+                  renderEmpty={{
+                    image: college,
+                    description: '暂无数据',
+                  }}
                   rowKey={(record) => record.id}
                   rowKey={(record) => record.id}
                   dataSource={pictureDataSource}
                   dataSource={pictureDataSource}
                   columns={this.parsePictureColumns()}
                   columns={this.parsePictureColumns()}