From 64027e45c5b0d9dfe1a5536f30ca9183af24b456 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 13 一月 2026 11:01:06 +0800
Subject: [PATCH] Merge branch 'jtwy' into dev_New

---
 src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java |    7 ++++++-
 1 files changed, 6 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 b5dcb70..67f9d03 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDtoCopy.java
@@ -49,7 +49,7 @@
      */
     private String customerName;
 
-    private String salesLedgerProductId;
+    private Long salesLedgerProductId;
 
     /**
      * 鍑哄叆搴撴暟閲�
@@ -131,6 +131,11 @@
      */
     @Excel(name = "浜у搧澶х被")
     private String productCategory;
+     /**
+     * 浜у搧id
+     */
+    @Excel(name = "浜у搧id")
+    private Long productId;
 
     /**
      * 瑙勬牸鍨嬪彿

--
Gitblit v1.9.3