Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-28 07b19970e4223ed7c75ec6473a511458d76cdb01

 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;