From 853c8ba11072eae475273864e61733ae7294f004 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期四, 25 九月 2025 11:55:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/dto/AddLeaveDTO.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/AddLeaveDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/AddLeaveDTO.java index d600dde..49bd6ce 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/AddLeaveDTO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/AddLeaveDTO.java @@ -1,6 +1,7 @@ package com.ruoyi.system.dto; import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -13,9 +14,11 @@ public class AddLeaveDTO implements Serializable { @ApiModelProperty(value = "开始请假/外出/出差/销假时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime startTime; @ApiModelProperty(value = "结束请假/外出/出差/销假时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime endTime; @ApiModelProperty(value = "请假/外出/出差/销假时长(天)") -- Gitblit v1.7.1