Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-01 0ab77d6e1b6102b1fd14a134a9acb6d173f40d2b

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComActNeighborCircleService.java

@@ -61,6 +61,13 @@
    R pageNeighborByAdmin(ComActNeighborCircleAdminDTO comActNeighborCircleAdminDTO);

    /**
     * 统计大屏查询清单列表
     * @param neighborCircleAdminDTO
     * @return
     */
    R pageNeighborByBigScreen(ComActNeighborCircleAdminDTO neighborCircleAdminDTO);

    /**
     * 邻里圈_添加
     * 
     * @param addNeighborCircleAdminVO
@@ -262,5 +269,12 @@
     * @param phone
     * @return
     */
    R selectCount(@RequestParam("type")Integer type, @RequestParam("phone")String phone);
    R selectCount(@RequestParam("type")Integer type, @RequestParam("phone")String phone,@RequestParam("communityId")Long communityId);

    /**
     * 分页查询可关联清单列表
     * @param neighborCircleAppDTO
     * @return
     */
    R pageRelationList(ComActNeighborCircleAppDTO neighborCircleAppDTO);
}