From 325c6107782d4a2284bb24be688e7a87462dc202 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期日, 28 九月 2025 14:48:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/query/AssetStatisticsListQuery.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/AssetStatisticsListQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/AssetStatisticsListQuery.java
index 7dce783..c34b406 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/AssetStatisticsListQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/AssetStatisticsListQuery.java
@@ -17,4 +17,8 @@
     private Integer assetTypeId;
     @ApiModelProperty(value = "资产分类ids 前端忽略")
     private List<Integer> assetTypeIds;
+    @ApiModelProperty(value = "资产ids 前端忽略")
+    private List<Integer> assetMainIds;
+    @ApiModelProperty(value = "部门id 前端忽略")
+    private List<Integer> deptIds;
 }

--
Gitblit v1.7.1