Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud

src/views/admin/system/user/index.vue

@@ -26,6 +26,9 @@
 							<el-form-item style="width: 250px" label="部门" prop="deptId">
 								<select-dept v-model="state.queryForm.deptId" clearable />
 							</el-form-item>
+							<el-form-item style="width: 250px" label="角色" prop="role">
+								<select-role v-model="state.queryForm.role" clearable />
+							</el-form-item>
 							<el-form-item>
 								<el-button icon="Search" type="primary" @click="getDataList">查询</el-button>
 								<el-button icon="Refresh" @click="resetQuery">重置</el-button>