Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/views/system/organization/components/org-user-edit.vue

@@ -100,7 +100,7 @@
 
           <el-form-item label="工种:" prop="workTypeId">
             <DictSelection
-              dictName="工种"
+              dictName="工种类型"
               clearable
               filterable
               v-model="form.workTypeId"