Merge branch 'test' into 'yuyue_dev'

罗元桥

2021-08-30 eda58e0e6d4abdd2b060e28867d103045845aa69

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/AddNeighborCircleTopicAdminDTO.java

@@ -15,13 +15,13 @@
    @ApiModelProperty("话题名称")
    private String name;

    @ApiModelProperty(value = "社区id",hidden = true)
    @ApiModelProperty(value = "社区id", hidden = true)
    private Long communityId;

    @ApiModelProperty(value = "登录用户id",hidden = true)
    @ApiModelProperty(value = "登录用户id", hidden = true)
    private Long userId;

    @ApiModelProperty(value="发布状态(1.启用 2.禁用)")
    @ApiModelProperty(value = "发布状态(1.启用 2.禁用)")
    private Integer status;

    @ApiModelProperty("话题id")