src/modules/course-manage/components · 282636bb7284f818b3b9b210e1d52ac33294f464 · xiaomai-cloud-class / xiaomai-cloud-class-web

Merge branch 'feature/maolipeng/20210610/zuhuyouhua' into gray · 70da6adc

# Conflicts:
#	src/modules/course-manage/components/LiveCourseList.jsx
#	src/modules/course-manage/modal/ManageCoursewareModal.jsx
#	src/modules/course-manage/video-course/AddVideoCourse.jsx

committed Jul 04, 2021

70da6adc

Name	Last commit	Last Update
..
AddLiveBasic.jsx		Loading commit data...
AddLiveBasic.less		Loading commit data...
AddLiveClass.jsx		Loading commit data...
AddLiveClass.less		Loading commit data...
AddLiveIntro.jsx		Loading commit data...
AddLiveIntro.less		Loading commit data...
EditorBox.jsx		Loading commit data...
EditorBox.less		Loading commit data...
GraphicsEditor.jsx		Loading commit data...
GraphicsEditor.less		Loading commit data...
LiveCourseFilter.jsx		Loading commit data...
LiveCourseFilter.less		Loading commit data...
LiveCourseList.jsx		Loading commit data...
LiveCourseList.less		Loading commit data...
LiveCourseOpt.jsx		Loading commit data...
liveCourseOpt.less		Loading commit data...