From e56c1cce484cd8df8c3373d4e2b5847d11b09abe Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 23 九月 2025 14:08:10 +0800
Subject: [PATCH] 代码合并解决冲突 bug修改
---
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