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

廖井涛

3 天以前 ac225bd66eb7c21b5af1d8533dc59376ea53da6c

 north-glass-erp/src/main/java/com/example/erp/service/sd/BomDataService.java

@@ -95,7 +95,7 @@
        if (!orderDetailsList.isEmpty()) {
            for (OrderDetail od : orderDetailsList) {
                Map<String, Object> itemmap = new HashMap<>();
                itemmap.put("data", bomDataMapper.getBOMDetails(od.getProductId()));
                itemmap.put("data", bomDataMapper.getBOMDetails(od.getProductId(),od.getOrderId()));
                list.add(itemmap);

            }