From 60afc1c228318d136a273cd0b389217f87583277 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 11 十月 2025 11:29:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/mapper/AssetMainMapper.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AssetMainMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AssetMainMapper.java
index 3abb27a..681a043 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AssetMainMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/AssetMainMapper.java
@@ -23,4 +23,11 @@
      */
     IPage<AssetMainPageVO> selectApprovedAssetPage(Page<?> page, @Param("query") AssetMainPageQuery query);
 
+    /**
+     * 获取已入库的资产列表
+     * @param page
+     * @param pageQuery
+     * @return
+     */
+    IPage<AssetMainPageVO> getAssetPageList(Page<AssetMainPageVO> page, @Param("query") AssetMainPageQuery pageQuery);
 }

--
Gitblit v1.7.1