From d8047152e563ba7816208a3fe9cf1ffdc9cddc83 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期三, 21 六月 2023 23:36:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckData.java b/igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckData.java
index b37c3fc..67b104f 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckData.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckData.java
@@ -68,6 +68,7 @@
 	//妫�楠屼汉
 	private String checkUser;
 	//璐ㄦ鏃堕棿
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
 	private Date checkTime;
 	//妫�楠岀粨鏋滐紝NONE-鏈楠岋紝PASS-宸叉楠岋紝UNPASS-涓嶅悎鏍�
 	private String checkStatus;
@@ -78,6 +79,8 @@
 	//璐ㄦ澧為噸
 	private double addCheck = 0.0;
 
+	private String remarks;
+
 	//鍖栭獙椤规暟鎹俊鎭�
 	private List<CheckItemData> checkItems;
 }

--
Gitblit v1.9.3