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/dto/ProcurementPageDtoCopy.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java
index 67f9d03..a328c1a 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java
@@ -18,6 +18,8 @@
 
     private Integer id;
 
+    private String ids;
+
     private Long createUser;
 
     /**
@@ -50,6 +52,8 @@
     private String customerName;
 
     private Long salesLedgerProductId;
+
+
 
     /**
      * 鍑哄叆搴撴暟閲�
@@ -172,6 +176,22 @@
      */
     @Excel(name = "涓嶅惈绋庢�讳环")
     private BigDecimal taxExclusiveTotalPrice;
+
+    /**
+     * 姣忕鏁伴噺
+     */
+    @Excel(name = "姣忕鏁伴噺")
+    private Integer boxNum;
+    /**
+     * 姣忕瑙勬牸
+     */
+    @Excel(name = "姣忕瑙勬牸")
+    private String cartonSpecifications;
+    /**
+     * 缇庡厓姣忎欢
+     */
+    @Excel(name = "缇庡厓姣忎欢")
+    private BigDecimal dollarPrice;
     /**
      * 鎶ヨ〃鏃ユ姤
      */

--
Gitblit v1.9.3