From 7488018d52edaafcd4e541c5fdeada8dd2e47b11 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期一, 22 十二月 2025 16:49:18 +0800
Subject: [PATCH] Merge branch 'jtwy' of http://114.132.189.42:9002/r/product-inventory-management-after into jtwy
---
src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java b/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
index ab500b7..5107c06 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
@@ -26,8 +26,17 @@
// 鍏ュ簱鏃堕棿
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鍏ュ簱鏃堕棿")
+ @Excel(name = "鍏ュ簱鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date inboundDate;
+
+ /**
+ * 缂栧彿
+ */
+ @Excel(name = "缂栧彿")
+ private String code;
+
+ @TableField(exist = false)
+ private String timeStr;
/**
* 寰呭嚭搴撴暟閲�
@@ -40,7 +49,7 @@
*/
@Excel(name = "鍑哄簱鏁伴噺")
@TableField(exist = false)
- private BigDecimal totalInboundNum;
+ private BigDecimal totalInboundNum = BigDecimal.ZERO;
// 鐗╁搧绫诲瀷
@Excel(name = "鐗╁搧绫诲瀷")
private String itemType;
@@ -83,21 +92,21 @@
* 鍏ュ簱鐢ㄦ埛id
*/
@TableField(fill = FieldFill.INSERT)
- private Long createUser;
+ private Integer createUser;
/**
* 鍏ュ簱鏃堕棿
*/
@TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDateTime createTime;
/**
* 淇敼鑰�
*/
@TableField(fill = FieldFill.INSERT_UPDATE)
- private Long updateUser;
+ private Integer updateUser;
/**
* 淇敼鏃堕棿
--
Gitblit v1.9.3