From 0d1a73f4c0d35951dc42f0e35526d69c0e922afc Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 17 十月 2025 15:00:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/query/OaApprovalApplicationAssetPageQuery.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/OaApprovalApplicationAssetPageQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/OaApprovalApplicationAssetPageQuery.java
index 9c63463..f741625 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/OaApprovalApplicationAssetPageQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/OaApprovalApplicationAssetPageQuery.java
@@ -18,7 +18,13 @@
@ApiModelProperty("关键词（标题/单据号/部门/领用人）")
private String keyword;
- @ApiModelProperty("部门ID（非管理员时作为数据权限过滤）")
+ @ApiModelProperty("部门ID（非管理员时作为数据权限过滤），前端不传")
private Integer deptId;
+
+ @ApiModelProperty("操作类型 前端不传")
+ private Integer type; // 0-领用，1-借用，2-归还
+
+ @ApiModelProperty("是否查询归还提醒 前端不传")
+ private Integer returnNotify = 0;
}
--
Gitblit v1.7.1