From 296203344a6d3c0b7f9208960c89a6cb02d59ed9 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 26 八月 2025 16:51:19 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 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