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

tangxiaobao

2021-08-19 4cb51a8d6a46993cb30e22dcbaf85424a0ba9d43

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

@@ -103,4 +103,7 @@

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

    @ApiModelProperty("话题id")
    private String topicId;
}