From 6146ab970705d0233a12b9fe475f9756e3271aa1 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 02 四月 2025 08:43:16 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
index 47698ae..1eb8bb5 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/ReportingWorkService.java
@@ -206,6 +206,8 @@
             map.put("historyTeams", reportingWorkMapper.historyTeamsMp(processIdStr, process));
             //鍘嗗彶宸ュ簭
             map.put("historyProcess", reportingWorkMapper.SelectHistoryProcessMp(historyProcess, process));
+            //鏄惁鍚堢墖宸ュ簭
+            map.put("laminating", laminating);
         }
         return map;
     }

--
Gitblit v1.8.0