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

buhuazhen

10 天以前 b7eb6e87b4d88e5a419b64e3e3d0e5dc1be0f48f

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

@@ -60,7 +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);
}