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

guoyujie

2025-10-15 fe45c4d2889b386d175f19e3f2f85c182c87ebd8

 north-glass-erp/src/main/java/com/example/erp/service/mm/BasicWarehouseTypeService.java

@@ -60,6 +60,7 @@
        return BasicDataMap;
    }


    public List<BasicWarehouseType> getBasicWarehouse(Map<String, Object> map) {
        return basicWarehouseTypeMapper.getBasicWarehouseTypeAll(map.get("originalFilm").toString(),map.get("accessories").toString());
    }