From 26b03b6720fe222be3fdad7931a94a4842dca0c2 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 21 八月 2024 11:52:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java
index 4068006..2e69882 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java
@@ -24,9 +24,20 @@
 
     private String reportType;
 
-    private Date beginCreateTime;
+//    private Date beginCreateTime;
+//
+//    private Date endCreateTime;
 
-    private Date endCreateTime;
+    private String pointId;
+
+    private String peopleId;
+
+    private List<Integer> pointIdList;
+
+    private List<Integer> peopleIdList;
+
+    @ApiModelProperty("鐘舵��")
+    private Integer status;
 
 }
 

--
Gitblit v1.8.0