Merge branch 'tmp_meeting_needs' into test

src/views/applyActive/components/theoryCourse.vue

@@ -282,7 +282,7 @@ export default {
                 onlineClassesNum: 10,
                 offlineClassesNum: 0,
                 subjectIdList: null,
-                vipGroupActivityId: 0
+                vipGroupActivityId: null
             },
             formName: {
                 vipGroupCategoryName: null,

src/views/teacher/VIP00Apply.vue

@@ -860,7 +860,7 @@ export default {
         form.subjectIdList = value.value;
         formName.subjectListName = value.text;
         formName.subjectListIndex = index;
-        loadData.subjectListSelect = value;
+        loadData.subjectListSelect = valofflineTeacherSalaryue;
       } else if (sheetForm.currentType == "vipGroupCategory") {
         // 课程形式赋值
         if (loadData.vipGroupCategorySelect.id != value.id) {