From 575e94e9db7e507ecec2441d24a13e9415fd9f03 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期三, 19 五月 2021 19:56:05 +0800
Subject: [PATCH] Merge branch 'cedoodev' into test

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthDTO.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthDTO.java
index ce0d976..71d8e95 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/PageEldersAuthDTO.java
@@ -89,5 +89,22 @@
     @ApiModelProperty(value = "出生日期", hidden = false, example = "2021-05-01 18:05:50")
     private Date birthDay;
 
+    @ApiModelProperty(value = "导出的ID", hidden = false, example = "")
+	private Long[] ids;
+
+    @ApiModelProperty(value = "查询类型 1 按月 2 按时间", hidden = false, example = "")
+    private String type;
+
+
+    @ApiModelProperty(value = "月份(1-12)", hidden = false, example = "")
+    private Integer month;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "创建起始时间", hidden = false, example = "2021-05-01 18:05:50")
+    private Date createAtStart;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiModelProperty(value = "创建结束时间", hidden = false, example = "2021-05-02 18:05:50")
+    private Date createAtEnd;
 
 }

--
Gitblit v1.7.1