From da5094f2b971076db2b09faf78ee6fc65e35f7c7 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 16 十二月 2025 13:21:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hckx' into hckx
---
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java
index 3dd180e..bc319ac 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementRecordOutPageDto.java
@@ -14,7 +14,28 @@
@Data
public class ProcurementRecordOutPageDto {
+ @Excel(name = "鍑哄簱缂栧彿")
+ private String code;
+
private Integer id;
+
+ private BigDecimal warnNum;
+ /**
+ * 閿�鍞悎鍚屽彿
+ */
+ private String salesContractNo;
+
+ /**
+ * 瀹㈡埛鍚堝悓鍙�
+ */
+ private String customerContractNo;
+
+ /**
+ * 瀹㈡埛鍚嶇О
+ */
+ @Excel(name = "瀹㈡埛鍚嶇О")
+ private String customerName;
+
/**
* 鍑哄叆搴撴暟閲�
@@ -26,8 +47,10 @@
* 鍑哄叆搴撴椂闂�
*/
// @Excel(name = "鍑哄簱鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDateTime createTime;
+
+ private String timeStr;
@Excel(name = "鍑哄簱鏃堕棿")
private String time;
@@ -43,6 +66,8 @@
*/
@Excel(name = "渚涘簲鍟嗗悕绉�")
private String supplierName;
+
+
/**
@@ -87,4 +112,8 @@
@Excel(name = "涓嶅惈绋庢�讳环")
private BigDecimal taxExclusiveTotalPrice;
+ /**
+ * 鐗╁搧绫诲瀷
+ */
+ private String itemType;
}
--
Gitblit v1.9.3