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/vo/LeaveDestroyDetailVO.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 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 6a7d6f7..6cb5c14 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
@@ -6,6 +6,7 @@
import lombok.Data;
import java.io.Serializable;
+import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
@@ -23,16 +24,22 @@
private String attachmentUrl;
@ApiModelProperty(value = "审批申请记录ID")
private Integer approvalApplicationId;
- @ApiModelProperty(value = "开始请假/外出/出差/销假时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-
+ @ApiModelProperty(value = "销假时间开始")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDateTime startTime;
- @ApiModelProperty(value = "结束请假/外出/出差/销假时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-
+ @ApiModelProperty(value = "销假时间结束")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDateTime endTime;
- @ApiModelProperty(value = "请假/外出/出差/销假时长（天）")
+ @ApiModelProperty(value = "销假时长（天）")
private Double duration;
+ @ApiModelProperty(value = "关联请假开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDateTime startTimeLeave;
+ @ApiModelProperty(value = "关联请假结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private LocalDateTime endTimeLeave;
+ @ApiModelProperty(value = "关联请假请假时长（天）")
+ private Double durationLeave;
@ApiModelProperty(value = "审批流程")
private List<ApprovalFlowNodeListVO> approvalFlowNodeListVOS;
--
Gitblit v1.7.1