Merge remote-tracking branch 'origin/master'

maven

7 天以前 c76a3b1194f320bf84061676d14200f7e78f044e

 src/main/java/com/ruoyi/device/mapper/DeviceLedgerMapper.java

@@ -1,18 +1,24 @@
package com.ruoyi.device.mapper;

import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.dto.DeviceLedgerExeclDto;
import com.ruoyi.device.dto.DeviceLedgerDto;
import com.ruoyi.device.execl.DeviceLedgerExeclDto;
import com.ruoyi.device.pojo.DeviceLedger;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

import java.util.List;

@Mapper
public interface DeviceLedgerMapper extends BaseMapper<DeviceLedger> {

    IPage<DeviceLedger> queryPage(Page page, DeviceLedger deviceLedger);
    IPage<DeviceLedgerDto> queryPage(Page page, @Param("deviceLedger") DeviceLedgerDto deviceLedgerDto);

    List<DeviceLedgerExeclDto> deviceLedgerExportList(DeviceLedger deviceLedger);

    @InterceptorIgnore(tenantLine = "true")
    DeviceLedger selectById1(Long id);
}