From c3360be51c33fbdf16a379156d29cc5cd919e50e Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 13 六月 2024 16:15:07 +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 | 13 ++++---------
1 files changed, 4 insertions(+), 9 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 37fa326..533d2f8 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
@@ -16,10 +16,7 @@
import org.springframework.stereotype.Service;
import java.sql.Date;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import static com.example.erp.service.sd.OrderService.getOrderProcessDetails;
@@ -284,9 +281,7 @@
return true;
}
- public Map<String, Object> printSetup(PrintSetup printSetup) {
- Map<String, Object> map = new HashMap<>();
- map.put("data", flowCardMapper.selectPrintSetup(printSetup));
- return map;
- }
+
}
+
+
--
Gitblit v1.8.0