From 2d03ec79e1892248b520cf097e8a58dd82a4892f Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 15:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

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

diff --git a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
index 1355a8b..a528151 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java
@@ -50,4 +50,9 @@
 
     @ApiModelProperty(value = "宸ュ崟澶勭悊鐢ㄦ埛ids")
     private String processUserIds;
+
+    @ApiModelProperty(value = "鏄惁鍙互鎶ュ伐")
+    private Boolean hasUnreportedMachine;
+
+    private String finalProductModel;
 }

--
Gitblit v1.9.3