From 58543a5e655bb9136130db498e38c38c07e35e44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=87=E9=87=8C?= <1726150332@qq.com>
Date: Wed, 5 Nov 2025 14:28:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E5=93=81=E5=A4=87=E4=BB=B6=E5=87=BA?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E4=BC=98=E5=8C=962?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/device/domain/EquSparepartsInOut.java  | 29 ++++++++++++++-----
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/EquSparepartsInOut.java b/op-modules/op-device/src/main/java/com/op/device/domain/EquSparepartsInOut.java
index c57ca5f04..383b02b2a 100644
--- a/op-modules/op-device/src/main/java/com/op/device/domain/EquSparepartsInOut.java
+++ b/op-modules/op-device/src/main/java/com/op/device/domain/EquSparepartsInOut.java
@@ -21,7 +21,7 @@ public class EquSparepartsInOut extends BaseEntity {
 
     private String id;
 
-    @Excel(name = "出入库类型")
+    @Excel(name = "出入库类型", readConverterExp = "type_out=出库,type_in=入库")
     private String inOutType;
 
     @Excel(name = "出入库单号")
@@ -42,22 +42,27 @@ public class EquSparepartsInOut extends BaseEntity {
     @Excel(name = "总价")
     private BigDecimal allPrice;
 
-    @Excel(name = "备用1")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "出入库时间",width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @Excel(name = "出入库人员")
+    private String nickName;
+   // @Excel(name = "备用1")
     private String attr1;
 
-    @Excel(name = "备用2")
+  //  @Excel(name = "备用2")
     private String attr2;
 
-    @Excel(name = "备用3")
+   // @Excel(name = "备用3")
     private String attr3;
 
-    @Excel(name = "删除标记")
+   // @Excel(name = "删除标记")
     private String delFlag;
 
-    @Excel(name = "工厂号")
+   // @Excel(name = "工厂号")
     private String factoryCode;
 
-    private String nickName;
 
     ///////////////////////////
     private String storageId;
@@ -82,6 +87,16 @@ public class EquSparepartsInOut extends BaseEntity {
         OutAmount = outAmount;
     }
 
+    @Override
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    @Override
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
     public String getNickName() {
         return nickName;
     }