From e1a6e20d22fbcb862247fac0a671a2a2722e7755 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 29 八月 2025 14:07:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim-jlmy' into pim-jlmy
---
main-business/src/main/java/com/ruoyi/business/entity/PendingInventory.java | 17 +++++++++++++++++
1 files changed, 17 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..7144e12 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
@@ -44,6 +44,7 @@
*/
@TableField(value = "supplier_name")
private String supplierName;
+
/**
* 渚涜揣鍟嗗悕绉�
*/
@@ -55,10 +56,21 @@
@TableField(value = "coal_id")
private Long coalId;
/**
+ * 鐓ゆ枡绫诲瀷 1-鎴愬搧 2-鍘熸枡
+ */
+ @TableField(value = "type")
+ private Integer type;
+ /**
* 鍗曚綅
*/
@TableField(value = "unit")
private String unit;
+
+ /**
+ * 缂栫爜
+ */
+ @TableField(value = "code")
+ private String code;
/**
* 搴撳瓨鏁伴噺
*/
@@ -95,6 +107,11 @@
@TableField(value = "coal_plan_id")
private Long coalPlanId;
/**
+ * 閲囪喘绫诲瀷
+ */
+ @TableField(value = "purchase_type")
+ private Integer purchaseType;
+ /**
* 鐧昏鏃ユ湡
*/
@TableField(value = "registration_date")
--
Gitblit v1.9.3