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

tangxiaobao

2021-09-15 1b9b482e6c55f043a586665b84d2d0feb8daa397

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