From 1284fb157043e488aa1794d8f1b64ebf18aa5147 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 08 十月 2026 17:08:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_tide' into dev_tide
---
src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java b/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
index d2ce38d..f41f9c9 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
@@ -36,6 +36,14 @@
private Integer staffState;
/**
+ * 璇曠敤鏈燂紙鏈堬級
+ */
+ @Excel(name = "璇曠敤鏈燂紙鏈堬級")
+ private Integer probationPeriod;
+
+
+
+ /**
* 鍛樺伐缂栧彿
*/
@Excel(name = "鍛樺伐缂栧彿")
@@ -133,6 +141,25 @@
@Excel(name = "鍚堝悓缁撴潫鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date contractEndTime;
+ /**
+ * 绂昏亴鏃ユ湡
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "绂昏亴鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date leaveDate;
+
+ /**
+ * 绂昏亴鍘熷洜
+ */
+ @Excel(name = "绂昏亴鍘熷洜")
+ private String leaveReason;
+
+ /**
+ * 宸ヤ綔浜ゆ帴鎯呭喌
+ */
+ @Excel(name = "宸ヤ綔浜ゆ帴鎯呭喌")
+ private String handoverInfo;
+
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
--
Gitblit v1.9.3