Merge remote-tracking branch 'origin/master'

mitao

14 小时以前 0d82e9bb89c8569847537f1ce8b9d994bbc4099b

 ruoyi-system/src/main/java/com/ruoyi/system/service/AssetTypeService.java

@@ -4,8 +4,12 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.dto.asset.AssetTypeDTO;
import com.ruoyi.system.model.AssetType;
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;
import com.ruoyi.system.vo.asset.AssetTypeTreeVO;
@@ -62,4 +66,13 @@
    PageInfo<AssetStatisticsVO> pageList(AssetStatisticsListQuery query);

    PageInfo<AssetStatisticsDetailVO> pageListDetail(AssetStatisticsListDetailQuery query);

    PageInfo<AssetInventoryVO> pageListInventory(AssetInventoryListQuery query);

    PageInfo<AssetStatisticsDetailVO> pageListInventoryDetail(AssetStatisticsListDetailQuery query);

    PageInfo<AssetIdleListVO> pageListIdle(AsseIdleListQuery query);

    List<AssetIdleListVO> pageListIdleNoLimit(AsseIdleListQuery query);

}