Merge branch 'online' into resetSound

dist/static/css/chunk-55d266a4.8f6cae49.css → dist/static/css/chunk-018076e2.92462f4a.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.micon[data-v-03661276]{position:absolute;top:3px;right:2px}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.micon[data-v-665b3b62]{position:absolute;top:3px;right:2px}

src/views/operateManager/serverIndexList.vue

@@ -142,6 +142,9 @@
           <el-table-column align="center"
                            prop="teacherName"
                            label="指导老师"></el-table-column>
+          <el-table-column align="center"
+                           prop="educationalTeacherName"
+                           label="教务老师"></el-table-column>
           <!-- <el-table-column align="center" label="当前有VIP课" width="100" >
             <template slot-scope="scope">
               <div>{{scope.row.existVipCourse?'是':'否'}}</div>