From 954c2b2cfe23c82bad473e2dce979d85e320b2f4 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期一, 30 六月 2025 15:50:51 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/applet/dto/LeaveDTO.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/applet/dto/LeaveDTO.java b/ruoyi-system/src/main/java/com/ruoyi/system/applet/dto/LeaveDTO.java index 0260c7a..9e93932 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/applet/dto/LeaveDTO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/applet/dto/LeaveDTO.java @@ -1,13 +1,22 @@ package com.ruoyi.system.applet.dto; +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.system.model.TLeave; import com.ruoyi.system.model.TProblemEscalation; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; + +import java.time.LocalDateTime; @Data @ApiModel(value = "发起请假DTO") public class LeaveDTO extends TLeave { + @ApiModelProperty(value = "请假开始日期") + private String startTime1; + @ApiModelProperty(value = "请假结束日期") + private String endTime1; } -- Gitblit v1.7.1