Merge remote-tracking branch 'origin/master'

于杰

2025-08-29 6b6f3fbd333894209e0df1822ff89881aa4319fe

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