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

huanghongfa

2021-08-19 c40be027ef8068b9a77bb24c94291dee25f563d8

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