From 28f9605441cdda5bd9cfabd2241ff8509a4a8888 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 20 十月 2025 18:48:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/query/AssetStatisticsListDetailQuery.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/AssetStatisticsListDetailQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/AssetStatisticsListDetailQuery.java
index 8742ebc..a07cccb 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/AssetStatisticsListDetailQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/AssetStatisticsListDetailQuery.java
@@ -5,6 +5,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.time.LocalDateTime;
import java.util.List;
@Data
@@ -17,8 +18,16 @@
private Integer assetTypeIdSecond;
@ApiModelProperty(value = "资产状态")
private String assetStatus;
+ @ApiModelProperty(value = "资产类别")
+ private String category;
@ApiModelProperty(value = "资产ids 前端忽略")
private List<Integer> assetMainIds;
- @ApiModelProperty(value = "部门id 前端忽略")
- private Integer deptId;
+ @ApiModelProperty(value = "部门ids 前端忽略")
+ private List<Integer> deptIds;
+ @ApiModelProperty(value = "年月 yy-MM")
+ private String date;
+ @ApiModelProperty(value = "开始时间前端忽略")
+ private LocalDateTime dateStart;
+ @ApiModelProperty(value = "结束时间前端忽略")
+ private LocalDateTime dateEnd;
}
--
Gitblit v1.7.1