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

zss

2 天以前 40946ba6c24a0318f14cbed603f0ed9cad1da853

 src/main/java/com/ruoyi/procurementrecord/service/ProcurementRecordService.java

@@ -61,4 +61,6 @@
    InventoryInformationDto getReportList();

    IPage<ProductModel> listPageProductionStock(Page page);

    IPage<ProcurementPageDto> listPageByProductProduction(Page page, ProcurementPageDto procurementDto);
}