From 259e978c64b36f57aa1959c6d760416b86b26c34 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期一, 05 一月 2026 10:51:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/sqd' into sqd
---
src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java b/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
index 4ee26a7..55be343 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffJoinLeaveRecord.java
@@ -71,11 +71,14 @@
* 閮ㄩ棬宀椾綅id
*/
// @Excel(name = "宀椾綅")
- private Integer deptPositionId;
+ private Long deptPositionId;
- @TableField(exist = false)
+// @TableField(exist = false)
+// @Excel(name = "宀椾綅")
+// private String deptPositionName;
+
@Excel(name = "宀椾綅")
- private String deptPositionName;
+ private String postJob;
/**
* 瀹跺涵浣忓潃
--
Gitblit v1.9.3