From 4ec71930da15cc83b2fbf67fdeade89b8900b14c Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 31 三月 2026 17:32:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java b/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
index 17e7612..18fe2e0 100644
--- a/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
+++ b/src/main/java/com/ruoyi/production/pojo/ProductionProductOutput.java
@@ -20,7 +20,7 @@
@ApiModelProperty(value = "浜у搧id")
private Long productModelId;
- @ApiModelProperty(value = "鍚堟牸鏁伴噺")
+ @ApiModelProperty(value = "鍚堟牸鏁伴噺/浜у嚭鏂归噺")
private BigDecimal quantity;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@@ -31,6 +31,9 @@
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
- @ApiModelProperty(value = "涓嶅悎鏍兼暟閲�")
+ @ApiModelProperty(value = "涓嶅悎鏍兼暟閲�/涓嶅悎鏍兼柟閲�")
private BigDecimal scrapQty;
+
+ @ApiModelProperty(value = "鎬绘暟閲�")
+ private BigDecimal totalQuantity;
}
--
Gitblit v1.9.3