From 4114759a57d73661937f28a765fb8a67c017b14b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 24 六月 2025 16:28:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java
index c1246aa..9181676 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WarehouseAreas.java
@@ -127,7 +127,7 @@
* 娣诲姞鏃堕棿
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
@@ -141,7 +141,7 @@
* 淇敼鏃堕棿
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
- @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
--
Gitblit v1.9.1