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/ComActNeighborCircleAppVO.java

@@ -107,4 +107,7 @@

    @ApiModelProperty("话题id")
    private String topicId;

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