update

src/components/studentIndex.vue

@@ -722,11 +722,8 @@ export default {
               res.data[0][i].name = "赛道";
             }else if(res.data[0][i].id == "2f8beae3-d030-11ec-8c78-005056b86db5"){
               res.data[0][i].name = "主题";
-<<<<<<< HEAD
-=======
             }else if(res.data[0][i].id == "34628934-d02f-11ec-8c78-005056b86db5"){
               res.data[0][i].name = "年级";
->>>>>>> beta
             }
             if (!this.CourseTypeJson[res.data[0][i].id]) {
               this.CourseTypeJson[res.data[0][i].id] = [];