Merge branch 'test_bak' into 'master'

罗元桥

2021-09-27 a5ebb9545a1fdc78f6c1c285ce4f6c7a37b9e749

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