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

tangxiaobao

2021-07-27 db9d95db6f25f95cbc614525adef7dbdeae6478c

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

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

    @ApiModelProperty("话题名称")
    private String topicName;
}