Merge branch 'local_20221024' into huacheng_test

yanghui

2022-10-24 65179374c17f1c3012f801d7b1a8d81c350ed1c6

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleTopicServiceImpl.java

@@ -103,8 +103,8 @@
     * @return 邻里圈话题列表
     */
    @Override
    public R getNeighborTopicByApp(String name, Integer belongType){
        return R.ok(this.baseMapper.getNeighborTopicByApp(name, belongType));
    public R getNeighborTopicByApp(String name){
        return R.ok(this.baseMapper.getNeighborTopicByApp(name));
    }

    /**