From 10f65333417f064377b01a89064d2ce716603a07 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 30 八月 2024 20:19:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/query/ReportQuery.java |   22 +++++++++++++++++++---
 1 files changed, 19 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 db59460..50b9caf 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
@@ -1,13 +1,12 @@
 package com.ycl.platform.domain.query;
 
 import com.ycl.platform.base.AbsQuery;
-import java.util.List;
-import org.springframework.lang.NonNull;
-import jakarta.validation.constraints.NotBlank;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
+
+import java.util.List;
 
 /**
  * 鎶ュ鏌ヨ
@@ -22,5 +21,22 @@
 
     private String reportType;
 
+    private String keyword;
+
+//    private Date beginCreateTime;
+//
+//    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