Merge remote-tracking branch 'origin/master'

huanghongfa

2021-07-30 b200b681bc401bb11c133a79273ba78cb6ebedf8

 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());
        }