From 8bba7f03df59c7689dbb64a952a63944a1f43ade Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 30 六月 2023 16:05:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 igds-core/src/main/java/com/ld/igds/inout/dto/InoutData.java |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/igds-core/src/main/java/com/ld/igds/inout/dto/InoutData.java b/igds-core/src/main/java/com/ld/igds/inout/dto/InoutData.java
index 6dc7185..f1549e1 100644
--- a/igds-core/src/main/java/com/ld/igds/inout/dto/InoutData.java
+++ b/igds-core/src/main/java/com/ld/igds/inout/dto/InoutData.java
@@ -42,12 +42,6 @@
 	private Date emptyWeightTime;
 
 	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-	private Date handleStart;
-
-	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
-	private Date handleEnd;
-
-	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
 	private Date completeTime;
 	
 	private List<FileData> files;//鎻愪氦鐨勭浉鍏抽檮浠朵俊鎭紝渚嬪鐓х墖銆�

--
Gitblit v1.9.3