From 1901a22a3b2d7a2a076b69ecd78d24ec55d5a3e8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 22 八月 2024 18:26:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 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 4e63f3b..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,9 @@
 
     private String reportType;
 
-    private Date beginCreateTime;
-
-    private Date endCreateTime;
+//    private Date beginCreateTime;
+//
+//    private Date endCreateTime;
 
     private String pointId;
 
@@ -36,5 +36,8 @@
 
     private List<Integer> peopleIdList;
 
+    @ApiModelProperty("鐘舵��")
+    private Integer status;
+
 }
 

--
Gitblit v1.8.0