Merge branch 'local_20221024' into huacheng_test

yanghui

2022-11-01 d6f2a3d6c68cc2626b3a1baef7383e66a0f7a58e

 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;