From 12a4fa586202ed27b397c51fc88ff130188bd165 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 16 八月 2024 17:14:17 +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/FlowCardService.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
index de8b7ad..d84cbda 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java
@@ -325,6 +325,7 @@
                 itemmap.put("processList", processList);
               //  itemmap.put("numberList", numberList);
                 itemmap.put("count", flowCardMapper.countFlowCard(flowCard.getOrderId()));
+                itemmap.put("remarkList", flowCardMapper.remakList(flowCard.getProcessId()));
                 list.add(itemmap);
 
             }

--
Gitblit v1.8.0