Merge branch 'test_bak' into 'master'

罗元桥

2021-09-27 1b2c5d5c8ba022a68e23f08bab48198529de1fca

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