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 |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 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..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;
 
     /**
@@ -49,7 +51,9 @@
      */
     private String customerName;
 
-    private String salesLedgerProductId;
+    private Long salesLedgerProductId;
+
+
 
     /**
      * 鍑哄叆搴撴暟閲�
@@ -131,6 +135,11 @@
      */
     @Excel(name = "浜у搧澶х被")
     private String productCategory;
+     /**
+     * 浜у搧id
+     */
+    @Excel(name = "浜у搧id")
+    private Long productId;
 
     /**
      * 瑙勬牸鍨嬪彿

--
Gitblit v1.9.3