Merge remote-tracking branch 'origin/master'

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

@@ -23,6 +23,9 @@
 							<el-form-item label="手机号" prop="phone">
 								<el-input v-model="state.queryForm.phone" placeholder="请输入手机号" clearable />
 							</el-form-item>
+							<el-form-item style="width: 250px" label="部门" prop="deptId">
+								<select-dept v-model="state.queryForm.deptId" 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>