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/AssetInventoryListQuery.java |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+), 0 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
new file mode 100644
index 0000000..65102ba
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/AssetInventoryListQuery.java
@@ -0,0 +1,31 @@
+package com.ruoyi.system.query;
+
+import com.ruoyi.common.core.domain.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Data
+@ApiModel(value = "资产出入库分页列表query")
+public class AssetInventoryListQuery extends BasePage {
+    @ApiModelProperty(value = "部门ids 前端忽略")
+    private List<Integer> deptIds;
+
+    @ApiModelProperty(value = "资产名称或编号")
+    private String nameOrCode;
+    @ApiModelProperty(value = "资产分类id")
+    private Integer assetTypeId;
+    @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 = "结束时间前端忽略")
+    private LocalDateTime dateEnd;
+}

--
Gitblit v1.7.1