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

101captain

2021-10-14 3ac9df9e72f1406cbfbd4c86b4d39d12f11b0701

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