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

liyong

6 天以前 ded338d0bafa5594b275edb81a8f69ea4446c37c

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

@@ -30,8 +30,12 @@

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