From fc830b7f62af651acedb8c11f1e2634fe2a3e497 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 14 一月 2026 14:20:46 +0800
Subject: [PATCH] Merge branch 'jtwy' into dev_New

---
 src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordOut.java |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordOut.java b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordOut.java
index 45de179..12dc8e9 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordOut.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordOut.java
@@ -22,7 +22,7 @@
     private Integer id;
 
     /**
-     * 浜у搧淇℃伅琛╥d
+     * 浜у搧淇℃伅琛╥d锛堣嚜瀹氫箟鍏ュ簱鏃朵负0锛�
      */
     private Integer salesLedgerProductId;
 
@@ -43,12 +43,18 @@
     private String inboundBatches;
 
     /**
-     * 鍑哄嚭搴撴暟閲�
+     * 鍑哄簱鏁伴噺
      */
     private BigDecimal inboundNum;
 
+
     /**
-     * 鍑哄嚭搴撶敤鎴�
+     * 鍑哄簱绫诲瀷 1-閲囪喘 2-閿�鍞� 3-鑷畾涔�
+     */
+    private Integer type;
+
+    /**
+     * 鍑哄簱鐢ㄦ埛
      */
     private String createBy;
     /**
@@ -81,4 +87,9 @@
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
 
+    /**
+     * 浜у搧ID
+     */
+    private Long productModelId;
+
 }

--
Gitblit v1.9.3