From d3dad0dc820d7baf365cc10288fdb5094a7babfa Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期四, 19 三月 2026 10:32:41 +0800
Subject: [PATCH] fix(hr): 修复员工信息导入时身份证有效期设置问题

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java
index 5d138cf..79c56c7 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java
@@ -47,9 +47,13 @@
     @TableField(exist = false)
     private String empNumb="";
     
+    @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
+    @TableField(exist = false)
+    @ExcelField(value = "现部门(护卫点)")
+    private String allDeptName = "";
+    
     @FieldInfo(name = "newDeptName", type = "varchar", explain = "新部门")
     @TableField("newDeptName")
-    @ExcelField(value = "现部门(护卫点)")
     private String newDeptName = "";
 
     @FieldInfo(name = "newJobName", type = "varchar", explain = "新岗位")
@@ -124,7 +128,7 @@
 
     //@FieldInfo(name = "version", type = "int", explain = "记录版本号,用来进行乐观锁控制")
     @TableField("version")
-    @Version
+    // @Version
     private Integer version = 0;
 
     @FieldInfo(name = "jobId", explain = "现岗位Id")
@@ -166,9 +170,7 @@
     @TableField(exist = false)
     private String empStatus;
 
-    @FieldInfo(name = "allDeptName", type = "bit", explain = "部门(护卫点)")
-    @TableField(exist = false)
-    private String allDeptName = "";
+    
 
     
 

--
Gitblit v1.8.0