Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/ssti-CollegeManage

src/views/activityManage/makerActvity.vue

@@ -14,8 +14,6 @@
           <div class="selectLabel">项目筛选</div>
           <el-select v-model="pavalues.value" @change="getData" placeholder="请选择">
             <el-option label="所有项目" value=""/>
-            <el-option label="所有分类" value=""/>
-            <el-option label="所有分类" value=""/>
             <el-option
               v-for="item in options"
               :key="item.courseId"