修改合并与被合并可option

src/constant/index.js

@@ -183,8 +183,8 @@ export const classTime = {
 }
 
 export const mergeCourseType = {
-  MASTER: '主课',
-  ASSIST: '副课',
+  MASTER: '合并课',
+  ASSIST: '被合并课',
 }
 export const mergeType = {
   合并课: '合并课',