From af73f49872f899a1cb301ae6e3ee23ebc28daf20 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 23 六月 2025 17:15:07 +0800
Subject: [PATCH] 2025-06-23 设备台账接口对接完成

---
 src/main/java/com/ruoyi/device/pojo/DeviceLedger.java |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java b/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
index f9c05b4..597e51b 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceLedger.java
@@ -3,8 +3,12 @@
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Date;
 
@@ -70,25 +74,29 @@
      * 褰曞叆鏃堕棿
      */
     @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
     /**
      * 鏇存柊鏃堕棿
      */
-    @TableField(fill = FieldFill.UPDATE)
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
     /**
      * 褰曞叆浜�
      */
     @TableField(fill = FieldFill.INSERT)
-    private String createUser;
+    private Integer createUser;
 
     /**
      * 鏇存柊浜�
      */
-    @TableField(fill = FieldFill.UPDATE)
-    private String updateUser;
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Integer updateUser;
 
     /**
      * 绉熸埛ID

--
Gitblit v1.9.3