From 628b80d0452602c5c02cec9ddbbee266f89d60c8 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 30 九月 2024 18:12:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
index 1712e99..88992c7 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/query/WorkOrderQuery.java
@@ -1,5 +1,6 @@
package com.ycl.platform.domain.query;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsQuery;
import enumeration.general.WorkOrderStatusEnum;
@@ -24,18 +25,18 @@
/**
* 宸ュ崟鍙�
*/
- private String workOrderNo;
+ private String keyword;
/**
* 杩愮淮澶勭悊鏃堕棿
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date start;
/**
* 杩愮淮澶勭悊鏃堕棿
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date end;
/**
--
Gitblit v1.8.0