From 0e6da184ed0a6d511a17e1ed86a470cda71c0f3b Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期一, 22 九月 2025 16:51:13 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationAttendance.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationAttendance.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationAttendance.java index 078c3d0..ca12c49 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationAttendance.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/OaApprovalApplicationAttendance.java @@ -60,5 +60,9 @@ @TableField("leave_approval_application_id") private Integer leaveApprovalApplicationId; + @ApiModelProperty(value = "是否是请假申请 0否1是") + @TableField("is_leave") + private Boolean isLeave; + } -- Gitblit v1.7.1