Merge branch 'haucheng_panzhihua' into huacheng_test

zhaozhengjie

2022-09-20 241408b071cb1b43d9307ae9c75c82bb77b6faa7

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

@@ -49,4 +49,6 @@
    private Integer belongType;
    @ApiModelProperty("话题id")
    private Long topicId;

    private Integer solveStatus;
}