From ecd6e50d0bb2c74e4b3f7a23e0d44f5e001987ea Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 23 四月 2026 13:57:47 +0800
Subject: [PATCH] 冲突解决

---
 src/main/java/com/ruoyi/procurementrecord/dto/ProcurementDto.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementDto.java
index 7864f93..7760c5a 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementDto.java
@@ -20,6 +20,10 @@
 
     private Integer recordId;
 
+    private Long productModelId;
+
+    private BigDecimal warnNum;
+
     /**
      * 鍏ュ簱鏁伴噺
      */

--
Gitblit v1.9.3