From 9398b7743fa976b016dfbb2b9cf4a04db340508e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 09 十月 2025 11:56:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/LeaveDestroyDetailVO.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/LeaveDestroyDetailVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/LeaveDestroyDetailVO.java
index 6cb5c14..47b1410 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/LeaveDestroyDetailVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/LeaveDestroyDetailVO.java
@@ -32,6 +32,8 @@
private LocalDateTime endTime;
@ApiModelProperty(value = "销假时长（天）")
private Double duration;
+ @ApiModelProperty(value = "是否可以审批")
+ private Boolean isAudit;
@ApiModelProperty(value = "关联请假开始时间")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDateTime startTimeLeave;
@@ -40,6 +42,8 @@
private LocalDateTime endTimeLeave;
@ApiModelProperty(value = "关联请假请假时长（天）")
private Double durationLeave;
+ @ApiModelProperty(value = "是否需要签名 0-否，1-是")
+ private Boolean signFlag;
@ApiModelProperty(value = "审批流程")
private List<ApprovalFlowNodeListVO> approvalFlowNodeListVOS;
--
Gitblit v1.7.1