From d3ee63dc365fbcb964a469150c9a84717f171eda Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 22 十二月 2025 13:44:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hckx' into hckx

---
 src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java b/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java
index f60b055..b04e43e 100644
--- a/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java
+++ b/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java
@@ -23,6 +23,9 @@
     @ApiModelProperty(value = "閿�鍞骇鍝両D")
     private Long salesLedgerProductId;
 
+    @ApiModelProperty(value = "鐢熶骇鎬婚噺(鍗曚綅kg)")
+    private BigDecimal totalProduction;
+
     @ApiModelProperty(value = "閿�鍞彴璐D")
     private Long salesLedgerId;
 
@@ -32,6 +35,10 @@
     @Excel(name = "鐢熶骇鐐掓満")
     private String speculativeTradingName;
 
+    @ApiModelProperty(value = "浜х嚎")
+    @Excel(name = "浜х嚎")
+    private String productionLine;
+
     @ApiModelProperty(value = "寮�濮嬫椂闂�")
     private String entryDateStart;
 

--
Gitblit v1.9.3