From 053c2264ab5d7596aea3f8fcac18d487e6f9c766 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 20 十月 2025 18:47:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/dto/AddBusinessTripDTO.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/AddBusinessTripDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/AddBusinessTripDTO.java
index 153be7e..08512cc 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/AddBusinessTripDTO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/AddBusinessTripDTO.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -12,9 +13,13 @@
public class AddBusinessTripDTO 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