Merge branch 'LAO_MO' into online

src/views/teamBuild/teamSeting/components/setClassV2.vue

@@ -142,7 +142,7 @@
         <el-form-item label="声部"
                       prop="subjectIdList"
                       :rules="[{ required: true, message: '请选择声部',trigger: 'blur'}]"
-                      v-if="newClassForm.type =='HIGH'">
+                      v-if="newClassForm.type =='HIGH' || newClassForm.type =='NORMAL'">
           <el-select v-model.trim="newClassForm.subjectIdList"
                      clearable
                      multiple>