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

maven

3 天以前 6d5f8d5dd6f337837c7a0007639490afe3c7409c

 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);
}