From 8da7ca5f5a5466c76b0d0abe23c7935e13e09136 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期六, 26 十一月 2022 12:50:34 +0800
Subject: [PATCH] Merge branch 'local_20221104' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java
index 4da371c..03f9fba 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java
@@ -1,11 +1,13 @@
package com.panzhihua.common.model.dtos.neighbor;
+import java.util.Date;
+import java.util.List;
+
import com.fasterxml.jackson.annotation.JsonFormat;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.util.Date;
/**
* @auther llming
@@ -15,12 +17,11 @@
@ApiModel("邻里圈请求参数")
public class ComActNeighborCircleAdminDTO {
- @ApiModelProperty(value = "分页-当前页数",example = "1")
+ @ApiModelProperty(value = "分页-当前页数", example = "1")
private Long pageNum = 1L;
- @ApiModelProperty(value = "分页-每页记录数",example = "10")
+ @ApiModelProperty(value = "分页-每页记录数", example = "10")
private Long pageSize = 10L;
-
@ApiModelProperty("发布开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@@ -33,10 +34,10 @@
@ApiModelProperty("议事主题")
private String releaseContent;
- @ApiModelProperty(value = "社区id",hidden = true)
+ @ApiModelProperty(value = "社区id", hidden = true)
private Long communityId;
- @ApiModelProperty(value="发布状态(1.待审核 2.显示 3.隐藏 4.驳回)")
+ @ApiModelProperty(value = "发布状态(1.待审核 2.显示 3.隐藏 4.驳回)")
private Integer status;
@ApiModelProperty("话题名称")
@@ -45,4 +46,13 @@
@ApiModelProperty("关键词")
private String keyWord;
+ @ApiModelProperty("使用类型（1.邻里圈 2.问题清单 3.需求清单）")
+ private Integer belongType;
+ @ApiModelProperty("话题id")
+ private Long topicId;
+
+ private Integer solveStatus;
+
+ @ApiModelProperty(value = "社区id集合", hidden = true)
+ private List<Long> communityIds;
}
--
Gitblit v1.7.1