From 11ecb9ee39fc61af04cd8d462faf9dce496d1773 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 11 九月 2025 15:19:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TErpSupplierWarehousing.java | 6 ++++--
1 files changed, 4 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..1b6f224 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,10 @@
@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