Commit b139b9d4 by wufan

fix:解决冲突

parent 314aa429
......@@ -2,13 +2,13 @@
* @Author: 吴文洁
* @Date: 2020-08-05 10:12:45
* @LastEditors: wufan
* @LastEditTime: 2021-05-30 20:36:15
* @LastEditTime: 2021-05-30 20:53:07
* @Description: 视频课-列表模块
* @Copyright: 杭州杰竞科技有限公司 版权所有
*/
import React from 'react';
import { Table, Modal, message , Tooltip,Switch,Dropdown} from 'antd';
import { PageControl } from "@/components";
import ShareLiveModal from "@/modules/course-manage/modal/ShareLiveModal"
import WatchDataModal from "../modal/WatchDataModal"
import CourseService from "@/domains/course-domain/CourseService"
......
......@@ -2,7 +2,6 @@
.ant-tabs-tab.ant-tabs-tab-active .ant-tabs-tab-btn {
font-weight: 500;
}
.link-create-course{
color:#666666;
font-size:14px;
......@@ -51,8 +50,7 @@
flex:1;
color:#666666;
font-size:14px;
}
}
}
}
.search-container {
margin-bottom: 16px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment