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/ProcurementManagementUpdateDto.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementManagementUpdateDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementManagementUpdateDto.java
index ae93d84..0356de7 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementManagementUpdateDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementManagementUpdateDto.java
@@ -15,6 +15,7 @@
 public class ProcurementManagementUpdateDto {
 
     private String createBy;
+    private BigDecimal minStock;
 
     private Long createUser;
 
@@ -23,5 +24,5 @@
     private String entryDate;
 
     private Integer id;
-
+    private Integer salesLedgerProductId;
 }

--
Gitblit v1.9.3