Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-26 8da7ca5f5a5466c76b0d0abe23c7935e13e09136

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

    /**