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

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

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

@@ -90,8 +90,17 @@
    private Integer type;

    /**
     * 发布状态(1.待审核 2.显示 3.隐藏 4.驳回)
     */
    @ApiModelProperty("发布状态(1.待审核 2.显示 3.隐藏 4.驳回)")
    private Integer status;

    /**
     * 社区id
     */
    @ApiModelProperty("社区id")
    private Long communityId;

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