Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

lidongdong

2022-10-11 84ff643bf7117c92acbbcdaaeb54329f3d651a86

 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;
}