fix:合并master并解决冲突

src/modules/course-manage/graphics-course/AddGraphicsCourse.jsx

@@ -2,7 +2,7 @@
  * @Author: 吴文洁
  * @Date: 2020-08-05 10:07:47
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-07-09 11:49:47
+ * @LastEditTime: 2021-07-08 19:32:50
  * @Description: 图文课新增/编辑页
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  */

src/modules/course-manage/offline-course/AddOfflineCourse.jsx

@@ -2,7 +2,7 @@
  * @Author: 吴文洁
  * @Date: 2020-08-05 10:07:47
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-07-09 11:50:06
+ * @LastEditTime: 2021-07-06 14:47:23
  * @Description: 线下课新增/编辑页
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  */

src/modules/course-manage/video-course/AddVideoCourse.jsx

 /*
  * @Author: 吴文洁
  * @Date: 2020-08-05 10:07:47
- * @LastEditors: yuananting
- * @LastEditTime: 2021-07-12 09:47:51
- * @Description: 线上课新增/编辑页
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2021-07-08 19:34:10
+ * @Description: 视频课新增/编辑页
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  */
 
@@ -507,16 +507,6 @@ class AddVideoCourse extends React.Component {
       coverId: coverId
     })
   }
-  // base64转换成blob
-  convertBase64UrlToBlob = (urlData) => {
-    const bytes = window.atob(urlData.split(',')[1])
-    const ab = new ArrayBuffer(bytes.length)
-    const ia = new Uint8Array(ab)
-    for (let i = 0; i < bytes.length; i++) {
-      ia[i] = bytes.charCodeAt(i)
-    }
-    return new Blob([ab], { type: 'image/png' })
-  }
 
   handleRenameCourseChapter = (chapterId) => {
     const { mediaNameAlias } = this.state;

src/modules/root/Header.jsx

 /*
  * @Author: 吴文洁
  * @Date: 2019-09-10 18:26:03
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-07-09 11:42:46
+ * @LastEditors: yuananting
+ * @LastEditTime: 2021-07-06 14:37:49
  * @Description:
  */
 import React, { useRef, useContext, useEffect, useState } from 'react';