From 1775bb71f952106c58657cf02891cbe2a286c8f8 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 22 九月 2021 11:30:47 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/neighbor/ComActNeighborCircleAdminDTO.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 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 044a79b..199b98f 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,12 @@
package com.panzhihua.common.model.dtos.neighbor;
+import java.util.Date;
+
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 +16,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,4 +33,16 @@
@ApiModelProperty("议事主题")
private String releaseContent;
+ @ApiModelProperty(value = "社区id", hidden = true)
+ private Long communityId;
+
+ @ApiModelProperty(value = "发布状态(1.待审核 2.显示 3.隐藏 4.驳回)")
+ private Integer status;
+
+ @ApiModelProperty("话题名称")
+ private String topicName;
+
+ @ApiModelProperty("关键词")
+ private String keyWord;
+
}
--
Gitblit v1.7.1