From 0b7e2752b6f1e87084b837043291c890cca780a8 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期三, 15 十月 2025 19:11:48 +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