Merge remote-tracking branch 'origin/master'

src/views/system/user/index.vue

@@ -171,6 +171,13 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="用户类型">
+              <el-select v-model="form.userType" placeholder="请选择用户类型">
+                <el-option v-for="item in user_type" :key="item.value" :label="item.label" :value="item.value" ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -223,7 +230,7 @@ import "splitpanes/dist/splitpanes.css"
 const router = useRouter();
 const appStore = useAppStore()
 const { proxy } = getCurrentInstance();
-const { sys_normal_disable, sys_user_sex } = proxy.useDict("sys_normal_disable", "sys_user_sex");
+const { sys_normal_disable, sys_user_sex, user_type } = proxy.useDict("sys_normal_disable", "sys_user_sex", "user_type");
 
 const userList = ref([]);
 const open = ref(false);