From ca0565e53494417b3779759f8d3898e07bfd5929 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 14:09:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/jtwy' into sqd-hb
---
src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java b/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
index 1802ca5..496c3d1 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/CustomStorage.java
@@ -25,11 +25,23 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
+
+ /**
+ * 鍥剧墖
+ */
+ @Excel(name = "鍥剧墖", cellType = Excel.ColumnType.IMAGE, height = 114, width = 25)
+ private String url;
// 鍏ュ簱鏃堕棿
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@Excel(name = "鍏ュ簱鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
private Date inboundDate;
+
+ /**
+ * 缂栧彿
+ */
+ @Excel(name = "缂栧彿")
+ private String code;
@TableField(exist = false)
private String timeStr;
@@ -40,12 +52,6 @@
@Excel(name = "寰呭嚭搴撴暟閲�")
@TableField(exist = false)
private BigDecimal inboundNum0;
-
- /**
- * 鍥剧墖
- */
- @Excel(name = "鍥剧墖", cellType = Excel.ColumnType.IMAGE)
- private String url;
/**
* 鍑哄簱鏁伴噺
*/
@@ -90,6 +96,20 @@
*/
@Excel(name = "鍏ュ簱鐢ㄦ埛")
private String createBy;
+ /**
+ * 寰呭嚭搴撴暟閲�
+ */
+ @Excel(name = "寰呭嚭搴撴暟閲�")
+ @TableField(exist = false)
+ private BigDecimal inboundNum0 = BigDecimal.ZERO;
+
+
+ /**
+ * 鍑哄簱鏁伴噺
+ */
+ @Excel(name = "鍑哄簱鏁伴噺")
+ @TableField(exist = false)
+ private BigDecimal totalInboundNum = BigDecimal.ZERO;
/**
* 鍏ュ簱鐢ㄦ埛id
*/
@@ -136,6 +156,7 @@
/**
* 缇庡厓姣忎欢
*/
- @Excel(name = "缇庡厓姣忎欢")
+ @Excel(name = "鍗曚环(缇庡厓)/浠�")
private BigDecimal dollarPrice;
+
}
--
Gitblit v1.9.3