Merge branch 'ol_12_30' into online

src/views/categroyManager/insideSetting/modals/select-user.vue

@@ -29,8 +29,8 @@
             >
               <el-option
                 v-for="option in options[row.organId]"
-                :key="option.id"
-                :value="option.id"
+                :key="option.id || option.userId"
+                :value="option.id || option.userId"
                 :label="option.realName"
               ></el-option>
             </el-select>
@@ -57,7 +57,7 @@ export default {
       const types = {
         repair: '维修技师',
         director: '乐队指导',
-        education: '教务老师',
+        education: '乐团主管',
         teamTeacher: '运营主管',
       }
       return types[this.name]