Merge branch 'test'

DESKTOP-71BH0QO\L、ming

2021-04-28 15dbac0af6437e16b6606d5c790d614851493f02

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NeighborApi.java

@@ -29,9 +29,9 @@
    private CommunityService communityService;

    @ApiOperation(value = "分页查询邻里圈列表" , response = ComActNeighborCircleAppVO.class)
    @PostMapping("page")
    @PostMapping("pageApp")
    public R pageNeighbor(@RequestBody ComActNeighborCircleAppDTO neighborCircleAppDTO) {
        return communityService.pageNeighbor(neighborCircleAppDTO);
        return communityService.pageNeighborByApp(neighborCircleAppDTO);
    }