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/AssetInventoryListQuery.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/AssetInventoryListQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/AssetInventoryListQuery.java
index 8f2f1d9..65102ba 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/AssetInventoryListQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/AssetInventoryListQuery.java
@@ -11,16 +11,19 @@
@Data
@ApiModel(value = "资产出入库分页列表query")
public class AssetInventoryListQuery extends BasePage {
- @ApiModelProperty(value = "部门id 前端忽略")
- private Integer deptId;
- @ApiModelProperty(value = "年月 yy-MM")
- private String date;
+ @ApiModelProperty(value = "部门ids 前端忽略")
+ private List<Integer> deptIds;
+
@ApiModelProperty(value = "资产名称或编号")
private String nameOrCode;
@ApiModelProperty(value = "资产分类id")
private Integer assetTypeId;
- @ApiModelProperty(value = "资产分类ids 前端忽略")
+ @ApiModelProperty(value = "资产分类ids ")
private List<Integer> assetTypeIds;
+ @ApiModelProperty(value = "资产ids 前端忽略")
+ private List<Integer> assetMainIds;
+ @ApiModelProperty(value = "年月 yy-MM")
+ private String date;
@ApiModelProperty(value = "开始时间前端忽略")
private LocalDateTime dateStart;
@ApiModelProperty(value = "结束时间前端忽略")
--
Gitblit v1.7.1