From 8a71194e0cd81a39637bc9c5adbd8c9d1405f155 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 08 四月 2026 16:39:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

---
 src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java |    5 +++++
 1 files changed, 5 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 c9cbaa1..b2f33b8 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -64,4 +64,9 @@
 
     private Long auditUserId;
     private String auditUserName;
+
+    private Long deviceId;
+    private String deviceName;
+    private String workMinutes;
+
 }

--
Gitblit v1.9.3