From 9e5c392acb19838c263a569b09bb56da94bdbbf6 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 05 一月 2026 10:49:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sqd' into sqd
---
src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java | 17 ++++++++++++++++-
1 files changed, 16 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 d2ce38d..55be343 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 = "鍛樺伐缂栧彿")
@@ -60,8 +68,15 @@
private String nativePlace;
/**
- * 宀椾綅
+ * 閮ㄩ棬宀椾綅id
*/
+// @Excel(name = "宀椾綅")
+ private Long deptPositionId;
+
+// @TableField(exist = false)
+// @Excel(name = "宀椾綅")
+// private String deptPositionName;
+
@Excel(name = "宀椾綅")
private String postJob;
--
Gitblit v1.9.3