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

zss

昨天 7f642bd0b97e30ef91ac6d2809d7e4a77d00c7fe

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

@@ -60,5 +60,7 @@
    BigDecimal getProcurementAmount(Long salesProductId);
    InventoryInformationDto getReportList();

    IPage<ProductModel> listPageProductionStock(Page page);
    IPage<ProductModel> listPageProductionStock(Page page, ProcurementPageDto procurementDto);

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