From 60f572b6b7c516db6ccda32c768f9117b4e51167 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 17 四月 2025 16:49:58 +0800
Subject: [PATCH] 1、fixbug:中空出片优先lisec问题解决 2、卧式理片笼出片路径调整，优先小线 3、fixbug:卧式理片笼两条线同时跑发生大线往小线送玻璃的情况 4、磨边后新增玻璃交互，为plc获取不到玻璃尺寸做二道保障
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/entity/request/HollowHistoryTaskRequest.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/entity/request/HollowHistoryTaskRequest.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/entity/request/HollowHistoryTaskRequest.java
index 0a68f20..cf446bf 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/entity/request/HollowHistoryTaskRequest.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/entity/request/HollowHistoryTaskRequest.java
@@ -35,7 +35,7 @@
*/
@ApiModelProperty(value = "寮�濮嬫椂闂�", position = 6)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date beginDate;
/**
@@ -43,6 +43,6 @@
*/
@ApiModelProperty(value = "缁撴潫鏃堕棿", position = 7)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date endDate;
}
--
Gitblit v1.8.0