From 95d8e5f4348497b1eee5884086534c86b1661b4f Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 27 十月 2025 19:56:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/resources/mapper/system/AssetAdMapper.xml | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/AssetAdMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AssetAdMapper.xml
index 42946b4..85306a6 100644
--- a/ruoyi-system/src/main/resources/mapper/system/AssetAdMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/AssetAdMapper.xml
@@ -26,17 +26,17 @@
</sql>
<select id="getPageList" resultType="com.ruoyi.system.vo.asset.AssetAdVO">
SELECT aa.id,
- asset_name,
- asset_code,
- dept_id,
- asset_type_id,
- location,
- rental_type,
- asset_status,
- remarks,
- attachment_urls,
- create_time,
- create_by
+ aa.asset_name,
+ aa.asset_code,
+ aa.dept_id,
+ aa.asset_type_id,
+ aa.location,
+ aa.rental_type,
+ aa.asset_status,
+ aa.remarks,
+ aa.attachment_urls,
+ aa.create_time,
+ aa.create_by
FROM asset_ad aa LEFT JOIN t_dept td ON aa.dept_id = td.id
<where>
aa.disabled = 0
--
Gitblit v1.7.1