From b200b681bc401bb11c133a79273ba78cb6ebedf8 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 30 七月 2021 18:16:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/api/LcEventApi.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/api/LcEventApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/api/LcEventApi.java
index 9ea9166..bfe7875 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/api/LcEventApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/api/LcEventApi.java
@@ -104,9 +104,9 @@
*/
@ApiOperation(value = "获取所有或者根据姓名和工号查询,分页")
@GetMapping("lc/event/getGridMemberListByAreaIdOrName")
- public R getGridMemberListByAreaIdOrName(String areaId,String param) {
+ public R getGridMemberListByAreaIdOrName(String areaId,String param,Long pageNum,Long pageSize) {
try {
- return R.ok(lcApiService.getGridMemberListByAreaIdOrName(areaId,param));
+ return R.ok(lcApiService.getGridMemberListByAreaIdOrName(areaId,param,pageNum,pageSize));
} catch (Exception e) {
log.error("获取指定区域网格列表出现错误：{}", e.getMessage());
}
--
Gitblit v1.7.1