Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-09-03 147a7ce2b1cc45cb58c69c82c3b0e0b2d3910b05

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

@@ -18,4 +18,10 @@
    @ApiModelProperty("话题名字")
    private String name;

    @ApiModelProperty("热度")
    private Long hotNum;

    @ApiModelProperty("邻里圈数量")
    private Integer count;

}