Merge branch 'test' into 'test_bak'

罗元桥

2021-10-01 d0ae6a6e9a8123f4869417b46e5d7423f8ca66d6

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