From 09394848ce262aff81897503d32ec334fd3f2b6f Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 20 一月 2026 15:59:30 +0800
Subject: [PATCH] Merge branch 'dev_tide' into dev_tide_zlglxt_xinlan
---
src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingDto.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingDto.java b/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingDto.java
index f8432c7..c6ac103 100644
--- a/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingDto.java
+++ b/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingDto.java
@@ -24,6 +24,15 @@
@ApiModelProperty(value = "閿�鍞彴璐D")
private Long salesLedgerId;
+ @ApiModelProperty(value = "鐢熶骇鎬婚噺(鍗曚綅kg)")
+ private BigDecimal totalProduction;
+
+ /**
+ * 鐢熶骇鐐掓満
+ */
+ @Excel(name = "鐢熶骇鐐掓満")
+ private String speculativeTradingName;
+
/**
* 閿�鍞悎鍚屽彿
*/
@@ -113,6 +122,9 @@
@Excel(name = "鐘舵��")
private String status;
+ @Excel(name = "杩涘害")
+ private BigDecimal progress;
+
@ApiModelProperty(value = "绉熸埛ID")
private Long tenantId;
--
Gitblit v1.9.3