From 3322c20909d2cc762b9a7a4a4c8b2bb728ebebd9 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 16 三月 2026 14:51:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_kthg' into dev_New_kthg
---
src/main/java/com/ruoyi/consumables/pojo/ConsumablesOutRecord.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/consumables/pojo/ConsumablesOutRecord.java b/src/main/java/com/ruoyi/consumables/pojo/ConsumablesOutRecord.java
index c34e169..b3711ee 100644
--- a/src/main/java/com/ruoyi/consumables/pojo/ConsumablesOutRecord.java
+++ b/src/main/java/com/ruoyi/consumables/pojo/ConsumablesOutRecord.java
@@ -35,7 +35,7 @@
private String outboundBatches;
@ApiModelProperty("鍏ュ簱鏁伴噺")
- private BigDecimal consumablesOutNum;
+ private BigDecimal stockOutNum;
@ApiModelProperty("鍏ュ簱鏉ユ簮id")
private Long recordId;
@@ -94,4 +94,7 @@
@ApiModelProperty("浜у搧id")
private Long productId;
+
+ @ApiModelProperty("纾呭崟鏂囦欢璺緞")
+ private String weighbridgeDocPath;
}
--
Gitblit v1.9.3