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

yanghui

2022-10-13 f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0

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