From a452e01cf489b546ebe65e08fcb1213b30e60cfa Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期六, 28 三月 2026 15:25:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hxsj' into hxsj

---
 src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java
index a0f73d9..93b12b7 100644
--- a/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java
+++ b/src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java
@@ -35,10 +35,25 @@
      * 鍏ュ簱鏁伴噺
      */
     private BigDecimal inboundNum;
+
+    /**
+     * 棰勮鏁伴噺
+     */
+    private BigDecimal warnNum;
 //    /**
 //     * 鏈�浣庡簱瀛樻暟閲�
 //     */
 //    private BigDecimal minStock;
+
+    /**
+     * 缂鸿揣鏁伴噺
+     */
+    private BigDecimal outStockQuantity;
+
+    /**
+     * 缂鸿揣鎯呭喌
+     */
+    private String shortageDescription;
 
     /**
      * 鍏ュ簱鐢ㄦ埛
@@ -71,4 +86,7 @@
      */
     @TableField(fill = FieldFill.INSERT)
     private Long tenantId;
+
+
+    private Long productModelId;
 }

--
Gitblit v1.9.3