From ca788dcbd73c5c8665b45da7ff4a0b1d92196b2c Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期三, 27 八月 2025 09:49:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy

---
 main-business/src/main/java/com/ruoyi/business/entity/PendingInventory.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/main-business/src/main/java/com/ruoyi/business/entity/PendingInventory.java b/main-business/src/main/java/com/ruoyi/business/entity/PendingInventory.java
index e46fc5a..e797d3f 100644
--- a/main-business/src/main/java/com/ruoyi/business/entity/PendingInventory.java
+++ b/main-business/src/main/java/com/ruoyi/business/entity/PendingInventory.java
@@ -55,6 +55,11 @@
     @TableField(value = "coal_id")
     private Long coalId;
     /**
+     * 鐓ゆ枡绫诲瀷 1-鎴愬搧 2-鍘熸枡
+     */
+    @TableField(value = "type")
+    private Integer type;
+    /**
      * 鍗曚綅
      */
     @TableField(value = "unit")

--
Gitblit v1.9.3