From 01a30369e55a754c28dec4939a99e59aefecdc60 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 08 八月 2024 20:48:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java
index 208918b..461f9a2 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/ReportForm.java
@@ -1,10 +1,13 @@
package com.ycl.platform.domain.form;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.system.domain.group.Update;
import com.ycl.system.domain.group.Add;
import com.ycl.platform.base.AbsForm;
import com.ycl.platform.domain.entity.Report;
import java.time.LocalDateTime;
+import java.util.Date;
+
import org.springframework.beans.BeanUtils;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
@@ -33,8 +36,16 @@
@ApiModelProperty("鐐逛綅")
private Integer pointId;
- @ApiModelProperty("瀹℃牳鏃堕棿")
- private LocalDateTime auditingTime;
+ @ApiModelProperty("鐢熸晥鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date beginCreateTime;
+
+ @ApiModelProperty("澶辨晥鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date endCreateTime;
+
+ @ApiModelProperty("瀹℃牳绫诲瀷")
+ private String reportType;
@NotBlank(message = "鎶ュ鍐呭涓嶈兘涓虹┖", groups = {Add.class, Update.class})
@ApiModelProperty("鎶ュ鍐呭")
--
Gitblit v1.8.0