From acbe0c6c601ff1368002d701631a43a2c00b61f5 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 15 十月 2025 15:27:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/AssetMainMapper.xml | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/AssetMainMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AssetMainMapper.xml
index 5ecaeba..5b99324 100644
--- a/ruoyi-system/src/main/resources/mapper/system/AssetMainMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/AssetMainMapper.xml
@@ -100,9 +100,7 @@
</select>
<select id="getAssetPageList" resultType="com.ruoyi.system.vo.asset.AssetMainPageVO">
SELECT
- am.id AS id,
- am.asset_code AS assetCode,
- am.asset_name AS assetName,
+ am.*,
at.type_name AS assetTypeName,
od.dept_name AS ownershipDeptName,
am.asset_status AS assetStatus,
--
Gitblit v1.7.1