Merge branch 'local_20221024' into haucheng_panzhihua

yanghui

2022-10-28 230dba4f152e7d744b8e6c1124a94d21d2e59018

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

@@ -25,6 +25,9 @@
    private Integer belongType;

    private Long communityId;

    @ApiModelProperty(value = "发布状态(1.启用 2.禁用)")
    private Integer status;
    /**
     * 使用类型（1.邻里圈 2.问题清单 3.需求清单）
     */