Merge branch 'test_future_wangge' into test

CeDo

2021-06-05 a5ebd7103f2375c8c241c6f14c586c7d75b0dd79

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java

@@ -622,6 +622,15 @@
    R queryPublicity(@RequestBody PagePublicityEventDTO pagePublicityEventDTO);

    /**
     * 分页查询宣传教育事件
     * @param pagePublicityEventDTO   请求参数
     * @return  结果
     */
    @PostMapping("/event/queryPublicityCommunity")
    R queryPublicityCommunity(@RequestBody PagePublicityEventCommunityDTO pagePublicityEventDTO);


    /**
     * 分页查询社区列表
     * @return  结果
     */
@@ -770,4 +779,20 @@
     */
    @PostMapping("/easy/admin/publicity")
    R easyPublicityByAdmin(@RequestBody ComActEasyPhotoEditAdminDTO photoHandleDTO);

    /**
     * 查询网格下所有网格员
     * @param gridId
     * @return
     */
    @PostMapping("/eventgriddata/grid/member")
    R getGridMemberListsByGrid(@RequestParam("gridId") Long gridId);

    /**
     * 查询网格下所有网格员
     * @param communityId
     * @return
     */
    @PostMapping("/eventgriddata/communitygrid")
    R getGridDataListByCommunity(@RequestParam("gridId") Long communityId);
}