Merge branch 'huacheng' into huacheng_test

101captain

2022-06-21 47589b52112f37e4366f96a7f13c6d99bbacdc77

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleTopicAppVO.java

@@ -24,4 +24,6 @@
    @ApiModelProperty("邻里圈数量")
    private Integer count;

    @ApiModelProperty("话题logo")
    private String logo;
}