Merge branch '0601Action' into jenkins

src/views/teamDetail/teamClassList.vue

@@ -86,7 +86,7 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item>
+        <el-form-item prop="mainTeacherUserId">
           <remote-search
             :commit="'setTeachers'"
             v-model="searchForm.mainTeacherUserId"