From 7fd37a99f4bf0a3f2955e60436c63e59b58054f4 Mon Sep 17 00:00:00 2001 From: ZengTao <2773468879@qq.com> Date: 星期六, 10 八月 2024 09:10:11 +0800 Subject: [PATCH] 新增自动报工功能,磨边队列,下片队列增加查询条件 --- hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/request/DownGlassInfoRequest.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/request/DownGlassInfoRequest.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/request/DownGlassInfoRequest.java index aa307b9..89cdbed 100644 --- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/request/DownGlassInfoRequest.java +++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/downglassinfo/entity/request/DownGlassInfoRequest.java @@ -6,6 +6,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; +import java.sql.Timestamp; import java.util.Date; /** @@ -34,14 +35,14 @@ * 寮�濮嬫椂闂� */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") private Date beginDate; /** * 缁撴潫鏃堕棿 */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") private Date endDate; -- Gitblit v1.8.0