Update teamClassList.vue

src/views/teamDetail/teamClassList.vue

@@ -51,33 +51,22 @@
           </select-all>
         </el-form-item>
         <el-form-item>
-          <<<<<<< HEAD
-          <el-select>
+          <el-select
+            v-model.trim="searchForm.groupType"
+            filterable
+            placeholder="课程组类型"
+            @change="
+              () => {
+                searchForm.type = '';
+              }
+            "
+          >
             <el-option
               v-for="(item, index) in courseListType"
               :key="index"
               :value="item.value"
               :label="item.label"
             />
-            =======
-            <el-select
-              v-model.trim="searchForm.groupType"
-              filterable
-              placeholder="课程组类型"
-              @change="
-                () => {
-                  searchForm.type = '';
-                }
-              "
-            >
-              <el-option
-                v-for="(item, index) in courseListType"
-                :key="index"
-                :value="item.value"
-                :label="item.label"
-              />
-              >>>>>>> parent of 820b56de5 (Revert "更新样式与调整")
-            </el-select>
           </el-select>
         </el-form-item>
         <!-- musicClassTypeList -->