From 3138e373e0c9c7eb5e0b0847ef16a7753c4fc170 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期四, 12 三月 2026 11:23:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/staff/pojo/StaffLeave.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffLeave.java b/src/main/java/com/ruoyi/staff/pojo/StaffLeave.java
index 9965c6d..619bbc3 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffLeave.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffLeave.java
@@ -21,12 +21,19 @@
@ApiModelProperty(value = "鍦ㄨ亴鍛樺伐ID")
private Long staffOnJobId;
+ @ApiModelProperty(value = "绂昏亴鍘熷洜")
+ private String reason;
+
+ @ApiModelProperty(value = "绂昏亴澶囨敞")
+ private String remark;
+
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
private Long tenantId;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8",shape = JsonFormat.Shape.STRING)
private LocalDateTime createTime;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
--
Gitblit v1.9.3