From 0dc0a47cf5f655cb0dbff082f7c36613c21e328b Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 12 七月 2021 18:30:01 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/LcApiService.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/LcApiService.java b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/LcApiService.java
index b7bbe4d..f4b8455 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/LcApiService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_api/src/main/java/com/panzhihua/serviceapi/biz/LcApiService.java
@@ -5,10 +5,7 @@
import com.panzhihua.common.model.dtos.api.EventInfo;
import com.panzhihua.common.model.dtos.grid.LcEventVisitingTasksListDTO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.serviceapi.model.dto.LcFlowPersonVisitRecordDTO;
-import com.panzhihua.serviceapi.model.dto.LcGridData;
-import com.panzhihua.serviceapi.model.dto.LcKeyPersonVisitRecordDTO;
-import com.panzhihua.serviceapi.model.dto.LcKeyPersonVisitRecordQueryDTO;
+import com.panzhihua.serviceapi.model.dto.*;
import java.util.List;
@@ -86,11 +83,12 @@
* description 获取所有或者根据姓名和工号查询,分页
*
* @param areaId 区域ID
+ * @param param 姓名或者工号
* @return String 网格员列表
* @author manailin
* @date 2021/6/10 17:00
*/
- String getGridMemberListByAreaIdOrName(String areaId);
+ List<GridMemberPageListDTO> getGridMemberListByAreaIdOrName(String areaId,String param);
/**
* description 提交事件登记关联的文件或者图片信息
--
Gitblit v1.7.1