From e2aa651db9f17d58819329de571037edc0f9eba2 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 23 六月 2025 18:13:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java |   44 ++++++++++++++++++++++++++------------------
 1 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/ruoyi/device/dto/DeviceLedgerExeclDto.java b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
similarity index 61%
copy from src/main/java/com/ruoyi/device/dto/DeviceLedgerExeclDto.java
copy to src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
index 6613c27..f299773 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceLedgerExeclDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
@@ -2,92 +2,100 @@
 
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+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.LocalDateTime;
 
+/**
+ * 璁惧鍙拌处瀹炰綋绫�
+ */
 @Data
-public class DeviceLedgerExeclDto {
+@TableName("device_ledger")
+public class DeviceLedgerDto {
 
+    /**
+     * 涓婚敭ID锛岃嚜澧�
+     */
+
+    private Long id;
 
     /**
      * 璁惧鍚嶇О
      */
-    @Excel(name = "璁惧鍚嶇О")
     private String deviceName;
 
     /**
      * 瑙勬牸鍨嬪彿
      */
-    @Excel(name = "瑙勬牸鍨嬪彿")
     private String deviceModel;
 
     /**
      * 渚涘簲鍟嗗悕绉�
      */
-    @Excel(name = "渚涘簲鍟嗗悕绉�")
     private String supplierName;
 
     /**
      * 鍗曚綅
      */
-    @Excel(name = "鍗曚綅")
     private String unit;
 
     /**
      * 鏁伴噺
      */
-    @Excel(name = "鏁伴噺")
     private BigDecimal number;
 
     /**
      * 鍚◣鍗曚环
      */
-    @Excel(name = "鍚◣鍗曚环")
     private BigDecimal taxIncludingPriceUnit;
 
     /**
      * 鍚◣鎬讳环
      */
-    @Excel(name = "鍚◣鎬讳环")
     private BigDecimal taxIncludingPriceTotal;
 
     /**
      * 绋庣巼
      */
-    @Excel(name = "绋庣巼")
     private BigDecimal taxRate;
 
     /**
      * 涓嶅惈绋庢�讳环
      */
-    @Excel(name = "涓嶅惈绋庢�讳环")
     private BigDecimal unTaxIncludingPriceTotal;
 
     /**
      * 褰曞叆鏃堕棿
-     *
      */
-    @Excel(name = "褰曞叆鏃堕棿")
     @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.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
 
     /**
      * 褰曞叆浜�
      */
-    @Excel(name = "褰曞叆浜�")
-    @TableField(fill = FieldFill.INSERT)
     private String createUser;
 
-
+    /**
+     * 鏇存柊浜�
+     */
+    private String updateUser;
 
     /**
      * 绉熸埛ID
      */
-    @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
 }

--
Gitblit v1.9.3