Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyujie

2025-09-05 b0c60452329a61c32db74a1c7d7753d383d6310a

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