From f3a7d211a4a616d8ed2a08b103d8d162f06d389e Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 07 八月 2025 17:23:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/Warehouse.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/Warehouse.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/Warehouse.java
index e7d1557..e177a8a 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/Warehouse.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/Warehouse.java
@@ -78,9 +78,9 @@
@ApiModelProperty(value = "鍒涘缓浜�")
private String createBy;
/**鍒涘缓鏃堕棿*/
- @Excel(name = "鍒涘缓鏃堕棿", width = 15, format = "yyyy-MM-dd HH:ss")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:ss")
+ @Excel(name = "鍒涘缓鏃堕棿", width = 15, format = "yyyy-MM-dd HH:mm")
+ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm")
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
private Date createTime;
/**鏇存柊浜�*/
@@ -88,9 +88,9 @@
@ApiModelProperty(value = "鏇存柊浜�")
private String updateBy;
/**鏇存柊鏃堕棿*/
- @Excel(name = "鏇存柊鏃堕棿", width = 15, format = "yyyy-MM-dd HH:ss")
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:ss")
+ @Excel(name = "鏇存柊鏃堕棿", width = 15, format = "yyyy-MM-dd HH:mm")
+ @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