Merge branch 'shuangzheng2' into huacheng_test

101captain

2022-08-01 bf46bac3cda70dc8dc7ed95e0461f1a72fba2eeb

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

@@ -207,9 +207,8 @@
    @ApiOperation(value = "查询社区邻里圈话题列表", response = ComActNeighborCircleTopicAppVO.class)
    @GetMapping("topic/list")
    public R getNeighborTopicByApp(
            @RequestParam(value = "name",defaultValue = "",required = false) String name,
            @RequestParam(value = "belongType", defaultValue = "1", required = false) Integer belongType) {
        return communityService.getNeighborTopicByApp(name, belongType);
            @RequestParam(value = "name",defaultValue = "",required = false) String name) {
        return communityService.getNeighborTopicByApp(name);
    }

    @ApiOperation(value = "用户删除邻里圈")
@@ -256,6 +255,16 @@
        return this.communityService.serviceStatic(serviceStaticDTO);
    }


    /**
     * 求助我的问题数量统计
     * @param type
     * @param phone
     * @return
     */
    @ApiOperation(value = "求助我的问题数量统计")
    @GetMapping("/selectCount")
    public R selectCount(@RequestParam("type")Integer type,@RequestParam(value = "phone",required = false)String phone){
        return this.communityService.selectCount(type,phone);
    }
}