From 61f9d261edb521fc9d0f23c5f0a116dcd90c6b23 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期二, 01 七月 2025 14:46:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/applet/query/LeaveListUserQuery.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/applet/query/LeaveListUserQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/applet/query/LeaveListUserQuery.java index 02bd6fa..bc5e367 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/applet/query/LeaveListUserQuery.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/applet/query/LeaveListUserQuery.java @@ -17,6 +17,8 @@ private List<Long> userIds; @ApiModelProperty(value = "类型1=我审批的 2=我申请的") private String type; + @ApiModelProperty(value = "类型1=待审批 2=已审批") + private String auditStatus; @ApiModelProperty(value = "当前登陆人id 前端忽略") private String userId; } -- Gitblit v1.7.1