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/AssetTypeMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/AssetTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/AssetTypeMapper.xml
index addde14..7e03785 100644
--- a/ruoyi-system/src/main/resources/mapper/system/AssetTypeMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/AssetTypeMapper.xml
@@ -137,7 +137,7 @@
AND t2.category = #{query.category}
</if>
<if test="query.assetTypeIdSecond != null and query.assetTypeIdSecond!=''">
- AND t2.asset_type_id = #{query.category}
+ AND t2.asset_type_id = #{query.assetTypeIdSecond}
</if>
<if test="query.assetStatus != null and query.assetStatus!=''">
--
Gitblit v1.7.1