fix:解决合并细节优化的冲突

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

@@ -2,8 +2,8 @@
  * @Author: 吴文洁
  * @Date: 2020-08-05 10:07:47
  * @LastEditors: yuananting
- * @LastEditTime: 2021-07-09 14:16:04
- * @Description: 视频课新增/编辑页
+ * @LastEditTime: 2021-07-09 15:26:15
+ * @Description: 线上课新增/编辑页
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  */
 
@@ -730,7 +730,7 @@ class AddVideoCourse extends React.Component {
                     {
                       _.map(courseChapterList,(item,index) => {
                         return <div className='course-ware' key={index}>
-                              <div className="course-ware__index">{`0${index + 1 } `}</div>
+                              <div className="course-ware__index">{index < 9 ? `0${index + 1 } ` : `${index + 1 } `}</div>
                               <img className='course-ware__img' src={courseWareIcon} alt='' />
                               <div className='course-ware__name'>{item.mediaName && item.mediaName.length > 24 ? <Tooltip title={item.mediaName}>{item.mediaName}</Tooltip>:item.mediaName}</div>
                               <div className="course-chapter__opt" id={item.id}>

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

@@ -9,7 +9,7 @@ function ChapterList(props){
             {
             _.map(courseChapterList,(item,index) => {
                 return <div className='course-ware'>
-                    <div className='course-ware__index'>{`0${index + 1 } `}</div>
+                    <div className='course-ware__index'>{index < 9 ? `0${index + 1 } ` : `${index + 1 } `}</div>
                     <div className="course-ware__detail">
                         <div className='course-ware__detail__name'>{item.mediaName}</div>
                         <div className='course-ware__detail__duration'>{window.formatDuration(item.videoDuration)}</div>

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

@@ -2,7 +2,7 @@
  * @Author: yuananting
  * @Date: 2021-07-05 10:50:10
  * @LastEditors: yuananting
- * @LastEditTime: 2021-07-08 19:38:43
+ * @LastEditTime: 2021-07-09 15:19:31
  * @Description: 描述一下咯
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
@@ -552,6 +552,7 @@ class SelectOperatorModal extends React.Component {
       _item.courseId = item.id;
       _item.courseType = 'VOICE';
       _item.courseName = item.courseName;
+      _item.courseChapterNum = item.courseChapterNum
 
       return _item;
     });