From 8d3065add0a652305563814e0852ce76fa80efea Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 14 一月 2026 17:08:03 +0800
Subject: [PATCH] 人力资源-新增离职,增加离职原因和备注

---
 src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java |   19 +++++++++++++++++++
 1 files changed, 19 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 58adbe0..e8f8934 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
@@ -151,6 +151,13 @@
     private Date trialStartDate;
 
     /**
+     * 璇曠敤缁撴潫鏃ユ湡
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "璇曠敤缁撴潫鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date trialEndDate;
+
+    /**
      * 绛捐鏃堕棿
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -181,6 +188,18 @@
     @Excel(name = "澶囨敞锛堢鍒╁緟閬囷級")
     private String remark;
 
+    /**
+     * 绂昏亴鍘熷洜
+     */
+    @Excel(name = "绂昏亴鍘熷洜",readConverterExp = "salary=钖祫寰呴亣,career_development=鑱屼笟鍙戝睍,work_environment=宸ヤ綔鐜,personal_reason=涓汉鍘熷洜,other=鍏朵粬")
+    private String dimissionReason;
+
+    /**
+     * 绂昏亴澶囨敞
+     */
+    @Excel(name = "绂昏亴澶囨敞")
+    private String dimissionRemark;
+
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     @TableField(fill = FieldFill.INSERT)

--
Gitblit v1.9.3