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

maven

昨天 d9ff3817f056ad245a16bd394133a407d6c6b9cf

 src/main/java/com/ruoyi/procurementrecord/mapper/ProcurementRecordMapper.java

@@ -30,9 +30,15 @@

    List<ProcurementPageDtoCopy> listCopy();

    List<ProcurementPageDtoCopy> listCopyOne();

    List<ProcurementPageDto> list();

    List<ProcurementPageDto> listOne();

    IPage<ProcurementPageDto> listPageByProduction(Page page, @Param("req") ProcurementPageDto procurementDto);

    IPage<ProcurementPageDtoCopy> listPageCopyByProduction(Page page, @Param("req") ProcurementPageDto procurementDto);

    IPage<ProcurementPageDtoCopy> listPagePRS(Page page, @Param("req") ProcurementPageDto procurementDto);
}