Merge remote-tracking branch 'origin/test' into test

CeDo

2021-06-04 c7c38dfd96047930999bcd7cf62d18d6d8651108

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventGridDataService.java

@@ -73,7 +73,7 @@
     * @param eventGridDataDTO  请求参数
     * @return  网格列表
     */
    R getGridMemberList(PageEventGridDataDTO eventGridDataDTO);
    R getGridMemberList(PageEventGridDataAdminDTO eventGridDataDTO);

    /**
     * 查询社区下所有网格员
@@ -81,4 +81,18 @@
     * @return  网格员列表
     */
    R getGridMemberLists(Long communityId);

    /**
     * 后台新增网格
     * @param eventGridDataDTO  请求参数
     * @return  新增结果
     */
    R addGridDataByAdmin(EventGridDataAddAdminDTO eventGridDataDTO);

    /**
     * 后台修改网格
     * @param eventGridDataDTO  请求参数
     * @return  修改结果
     */
    R editGridDataByAdmin(EventGridDataEditAdminDTO eventGridDataDTO);
}