Merge remote-tracking branch 'remotes/origin/sanshuohuitang_dev' into huach...

manailin

2022-09-29 c469e76e0c3eb803e7d190d105457224969c0bb4

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