From 0f86fe76d4d4fa5a4fa1e8661c6b40de87cdd2aa Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 15 四月 2021 21:58:37 +0800
Subject: [PATCH] fix(bug修复): 导出pdf时相关证件多选的转换

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpJobChange.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 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..10f85b1 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 = "新岗位")
@@ -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