Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-work-pc into dev

src/views/modules/shequzhili/tuceng/zhonghe/baseTotal.vue

@@ -288,7 +288,7 @@
 					<el-table-column
 						prop="categoryName"
 						align="center"
-						label="类别"
+						label="综治人群类别"
 						:show-overflow-tooltip="true"
 					>
 					</el-table-column>
@@ -592,6 +592,10 @@ export default {
 				.post("/actual/base/communityQuarters/listQuartersOptions", {
 					gridId: this.fmData.gridId,
 					agencyId: this.fmData.agencyId,
+					// 下拉框暂时不分页
+					isPage:false,
+					pageNo:null,
+					pageSize:null
 					// agencyId: user.agencyId
 				})
 				.then(({ data: res }) => {