Merge remote-tracking branch 'origin/sqd' into sqd

maven

8 天以前 b00f8a0bdccf0b0eed36f550e2c00176bfafe23f

 src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java

@@ -85,7 +85,7 @@
    public void exportOne(HttpServletResponse response) {
        List<ProcurementRecordOutPageDto> list = procurementRecordOutMapper.listOne();
        ExcelUtil<ProcurementRecordOutPageDto> util = new ExcelUtil<>(ProcurementRecordOutPageDto.class);
        util.exportExcel(response, list, "生产出库台账");
        util.exportExcel(response, list, "采购出库台账");
    }

    /**
@@ -96,7 +96,7 @@
    public void exportTwo(HttpServletResponse response) {
        List<ProcurementRecordOutPageDto> list = procurementRecordOutMapper.listTwo();
        ExcelUtil<ProcurementRecordOutPageDto> util = new ExcelUtil<>(ProcurementRecordOutPageDto.class);
        util.exportExcel(response, list, "生产出库台账");
        util.exportExcel(response, list, "成品出库台账");
    }

}