From 3ef1cf899c2bf558b934fd2c5dfdf0a970df8c43 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 29 八月 2025 15:22:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy
---
ruoyi-system/src/main/java/com/ruoyi/basic/entity/City.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/basic/entity/City.java b/ruoyi-system/src/main/java/com/ruoyi/basic/entity/City.java
index 3b3a350..67f4cb8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/basic/entity/City.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/basic/entity/City.java
@@ -6,7 +6,6 @@
import java.io.Serializable;
import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
/**
* 鍩庡競琛� 瀹炰綋绫�
@@ -39,10 +38,10 @@
/** 鍒涘缓鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(fill = FieldFill.INSERT)
- private OffsetDateTime createTime;
+ private LocalDateTime createTime;
/** 鏇存柊鏃堕棿 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(fill = FieldFill.INSERT_UPDATE)
- private OffsetDateTime updateTime;
+ private LocalDateTime updateTime;
}
\ No newline at end of file
--
Gitblit v1.9.3