Merge branch 'sanshuohuitang_dev' into huacheng_test

张天森

2022-09-29 4c80d2017a3b88b9ad55f28c3b87fd96eb67bcb2

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

@@ -19,6 +19,9 @@
    @ApiModelProperty(value = "登录用户id", hidden = true)
    private Long userId;

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

    @ApiModelProperty("话题id")
    private Long id;