Merge branch 'shuangzheng2' into huacheng_test

101captain

2022-08-01 f4d47d91a8bf41426497a0c42c10f5a78af0259b

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

@@ -45,4 +45,8 @@
    @ApiModelProperty("关键词")
    private String keyWord;

    @ApiModelProperty("使用类型（1.邻里圈 2.问题清单 3.需求清单）")
    private Integer belongType;
    @ApiModelProperty("话题id")
    private Long topicId;
}