From a08dce3de307ce138396db5fe7274ead2ef5c573 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期二, 20 一月 2026 17:12:08 +0800
Subject: [PATCH] Merge branch 'jtwy' of http://114.132.189.42:9002/r/product-inventory-management-after into sqd-hb
---
src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java | 16 +++++++++++++++-
1 files changed, 15 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..4b4e22d 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
@@ -69,8 +69,15 @@
private String nativePlace;
/**
- * 宀椾綅
+ * 閮ㄩ棬宀椾綅id
*/
+// @Excel(name = "宀椾綅")
+ private Long deptPositionId;
+
+// @TableField(exist = false)
+// @Excel(name = "宀椾綅")
+// private String deptPositionName;
+
@Excel(name = "宀椾綅")
private String postJob;
@@ -151,6 +158,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")
--
Gitblit v1.9.3