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

chenlu

2024-05-21 18fb477ea840e3dd4b19ff63f68f994d31fab43b

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

@@ -311,8 +311,8 @@
        return map;
    }

    public List<Order> exportOrderReport() {
        return orderDetailMapper.exportOrderReport();
    public List<Order> exportOrderReport(List<LocalDate> dates) {
        return orderDetailMapper.exportOrderReport(dates);
    }

    public Map<String,Object> getOrderProductSummary(Integer pageNum, Integer pageSize, List<String> selectDate, OrderDetail orderDetail) {