From 2a9c3934bb093c978a54a1c3e220e6a120855e77 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 09 一月 2026 15:11:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy

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

diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index 9dfb35b..f6aa5ba 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -19,4 +19,10 @@
 
     @ApiModelProperty(value = "鎶ュ伐鏁伴噺")
     private BigDecimal quantity;
+
+    @ApiModelProperty(value = "鏄惁鎶ュ伐")
+    private boolean reportWork;
+
+    @ApiModelProperty(value = "鎶ュ伐id")
+    private Long productMainId;
 }

--
Gitblit v1.9.3