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

manailin

2021-07-08 7eedb5a250515610f1df1fa0730cf779f0525add

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/neighbor/ComActNeighborCircleDetailAppVO.java

@@ -73,4 +73,7 @@
    @ApiModelProperty("社区id")
    private Long communityId;

    @ApiModelProperty("邻里圈话题名字")
    private String topicName;

}