Merge branch 'haucheng_panzhihua' into huacheng_test

zhaozhengjie

2022-09-17 fe1a0613d48e9b76b474d22073e72feda23b0d5c

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

@@ -262,5 +262,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);
}