Merge remote-tracking branch 'origin/huacheng_zts' into huacheng_test

张天森

2022-07-08 3983e5809d0ed2ce551a157a1b5b326b217c9b9c

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