Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

101captain

2022-07-22 da8edafa9803834b08061fd30ac79f8c249900b8

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

@@ -353,8 +353,8 @@
     * @return 邻里圈话题列表
     */
    @GetMapping("getNeighborTopicByApp")
    public R getNeighborTopicByApp(@RequestParam("name") String name) {
        return comActNeighborCircleTopicService.getNeighborTopicByApp(name);
    public R getNeighborTopicByApp(@RequestParam("name") String name, @RequestParam("belongType") Integer belongType) {
        return comActNeighborCircleTopicService.getNeighborTopicByApp(name, belongType);
    }

    /**