From df2ff592a5b9037a747032f3351836e0c61fb4f9 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 16 一月 2026 08:59:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 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..7cf3d29 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
@@ -72,7 +72,7 @@
* 宀椾綅
*/
@Excel(name = "宀椾綅")
- private String postJob;
+ private Integer sysPostId;
/**
* 瀹跺涵浣忓潃
@@ -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