Merge branch 'ol_12_30' into online

src/views/studentManager/components/studentVip.vue

@@ -14,7 +14,7 @@
           placeholder="课程名称"
           clearable
           @keyup.enter.native="onSearch"
-          v-model.trim="searchForm.classGroupName"
+          v-model.trim="searchForm.vipGroupName"
         ></el-input>
       </el-form-item>
       <el-form-item>