From 0daa458bd68398646cf5a817fb2c96df8113b5e1 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 21 一月 2026 15:57:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sqd' into sqd
---
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java
index 970872e..6b5860c 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java
@@ -49,7 +49,9 @@
*/
private String customerName;
- private String salesLedgerProductId;
+ private Long salesLedgerProductId;
+
+
/**
* 鍑哄叆搴撴暟閲�
@@ -131,6 +133,11 @@
*/
@Excel(name = "浜у搧澶х被")
private String productCategory;
+ /**
+ * 浜у搧id
+ */
+ @Excel(name = "浜у搧id")
+ private Long productId;
/**
* 瑙勬牸鍨嬪彿
@@ -167,22 +174,6 @@
*/
@Excel(name = "涓嶅惈绋庢�讳环")
private BigDecimal taxExclusiveTotalPrice;
-
- /**
- * 姣忕鏁伴噺
- */
- @Excel(name = "姣忕鏁伴噺")
- private Integer boxNum;
- /**
- * 姣忕瑙勬牸
- */
- @Excel(name = "姣忕瑙勬牸")
- private String cartonSpecifications;
- /**
- * 缇庡厓姣忎欢
- */
- @Excel(name = "缇庡厓姣忎欢")
- private BigDecimal dollarPrice;
/**
* 鎶ヨ〃鏃ユ姤
*/
--
Gitblit v1.9.3