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

huanghongfa

2021-04-28 b618786e735dcfcb8c929e7e1239f06f00634a38

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java

@@ -2244,7 +2244,7 @@
     * @param neighborCircleAppDTO  请求参数
     * @return  邻里圈列表
     */
    @PostMapping("/neighbor/pageNeighbor")
    R pageNeighbor(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);
    @PostMapping("/neighbor/pageNeighborByApp")
    R pageNeighborByApp(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO);

}