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

guoyujie

7 天以前 1750abd11320f8d09ffe1580b7467dba87c86c89

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

@@ -60,8 +60,9 @@
        return BasicDataMap;
    }

    public List<BasicWarehouseType> getBasicWarehouse() {
        return basicWarehouseTypeMapper.getBasicWarehouseTypeAll();

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


@@ -80,4 +81,11 @@
    }


    public Map<String, Object> BasicWarehouseTypeUser(String type){
        Map<String, Object> map = new HashMap<>();
        map.put("userName",basicWarehouseTypeMapper.getBasicWarehouseUser(type));
        return map;
    }


}