From 3de2d31db9ac65c354fd228ab84fa2ed786482b9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 29 九月 2025 11:12:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/query/AssetStatisticsListQuery.java | 4 +++-
1 files changed, 3 insertions(+), 1 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 4b0231c..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,6 +17,8 @@
private Integer assetTypeId;
@ApiModelProperty(value = "资产分类ids 前端忽略")
private List<Integer> assetTypeIds;
+ @ApiModelProperty(value = "资产ids 前端忽略")
+ private List<Integer> assetMainIds;
@ApiModelProperty(value = "部门id 前端忽略")
- private Integer deptId;
+ private List<Integer> deptIds;
}
--
Gitblit v1.7.1