Merge remote-tracking branch 'origin/master'

吴羡

12 小时以前 e5d1fb3d5ce9468b92e79825bbcb38f05ea73aff

 cnas-process/src/main/java/com/ruoyi/process/mapper/ProcessMethodSearchNewMapper.java

@@ -28,5 +28,8 @@
     */
    IPage<ProcessMethodSearchNew> pageMethodSearchNew(@Param("page") Page page, @Param("ew") QueryWrapper<ProcessMethodSearchNewBackupsDto> processMethodSearchNewDtoQueryWrapper, @Param("beginDate") String beginDate, @Param("endDate") String endDate);

    IPage<ProcessMethodSearchNew> pageAutoArchived(@Param("page") Page page,
                                                    @Param("ew") QueryWrapper<ProcessMethodSearchNew> queryWrapper);

}