Merge remote-tracking branch 'origin/master'

mitao

1 天以前 0d82e9bb89c8569847537f1ce8b9d994bbc4099b

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/AssetTypeMapper.java

@@ -3,9 +3,11 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.model.AssetType;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.system.query.AsseIdleListQuery;
import com.ruoyi.system.query.AssetInventoryListQuery;
import com.ruoyi.system.query.AssetStatisticsListDetailQuery;
import com.ruoyi.system.query.AssetStatisticsListQuery;
import com.ruoyi.system.vo.AssetIdleListVO;
import com.ruoyi.system.vo.AssetInventoryVO;
import com.ruoyi.system.vo.AssetStatisticsDetailVO;
import com.ruoyi.system.vo.AssetStatisticsVO;
@@ -34,5 +36,7 @@
    List<AssetStatisticsDetailVO> pageListInventoryDetail(@Param("query")AssetStatisticsListDetailQuery query,@Param("pageInfo") PageInfo<AssetStatisticsDetailVO> pageInfo);


    List<AssetIdleListVO> pageListIdle(@Param("query")AsseIdleListQuery query,@Param("pageInfo") PageInfo<AssetIdleListVO> pageInfo);

    List<AssetIdleListVO> pageListIdleNoLimit(@Param("query")AsseIdleListQuery query);
}