From 092a98a583c4fe822a3eb4c4dac086f84b16189c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 26 九月 2025 17:58:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierWarehousing.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierWarehousing.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierWarehousing.java
index 4bcdb15..f2f717b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierWarehousing.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierWarehousing.java
@@ -58,8 +58,13 @@
     @TableField("total_price")
     private BigDecimal totalPrice;
 
+    private Integer type;
+
 
     @ApiModelProperty(value = "入库单号")
-    @TableField("warehousing_no")
-    private String warehousingNo;
+    @TableField("warehouse_no")
+    private String warehouseNo;
+
+
+
 }

--
Gitblit v1.7.1