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

DESKTOP-71BH0QO\L、ming

2021-04-28 d47452e2a4d30c933a973a1d3e2f92221576df25

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

}