From e935889261ef38c8eaef31e54cbfc466d63d2ef4 Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期四, 17 七月 2025 09:42:28 +0800
Subject: [PATCH] fanuc获取程序名、获取报警描述

---
 lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/GoodsShelves.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/GoodsShelves.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/GoodsShelves.java
index 71098a0..c0b5746 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/GoodsShelves.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/GoodsShelves.java
@@ -84,16 +84,16 @@
     @ApiModelProperty(value = "鍒涘缓浜�")
     private String createBy;
 	/**鍒涘缓鏃堕棿*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     private Date createTime;
 	/**鏇存柊浜�*/
     @ApiModelProperty(value = "鏇存柊浜�")
     private String updateBy;
 	/**鏇存柊鏃堕棿*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:ss")
-    @DateTimeFormat(pattern="yyyy-MM-dd HH:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
     @ApiModelProperty(value = "鏇存柊鏃堕棿")
     private Date updateTime;
 }

--
Gitblit v1.9.3