From fec9f42e00f2df68a2a20cbf132b17bdeed8e63a Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 25 八月 2025 09:19:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java b/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
index e35ec42..713061e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java
@@ -1108,10 +1108,8 @@
return map;
}
- public Map<String, Object> mesOriginalSelect() {
- Map<String, Object> map = new HashMap<>();
- map.put("originalList", materialInventoryMapper.getSelectMaterialInventoryMes());
- return map;
+ public List<Map<String,Object>> mesOriginalSelect() {
+ return materialInventoryMapper.getSelectMaterialInventoryMes();
}
public String saveToExamineMaterialOutbound(Map<String,Object> object) {
--
Gitblit v1.8.0