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

guoyuji

2024-04-12 82733ad3ffd8f71315b16e934106f124c4eae356

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

@@ -75,6 +75,7 @@
                endDate = selectDate.get(1);
            }
        }
        System.out.println(pageSize);
        Map<String, Object> map = new HashMap<>();
        map.put("data", deliveryDetailMapper.getSelectDeliveryDetailReport(offset, pageSize,startDate,endDate, deliveryDetail));
        map.put("total", deliveryDetailMapper.getSelectDeliveryDetailReportPageTotal(offset, pageSize,startDate,endDate, deliveryDetail));