From 12ef02a92d7eafd63084c9fa303357040e0f29a1 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期一, 31 五月 2021 14:09:36 +0800
Subject: [PATCH] fix(bug修复): 汇总bug修改
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java
index a141d62..3a53a27 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java
@@ -53,7 +53,11 @@
@TableField(exist = false)
@ExcelField(value = "部门(护卫点)")
private String allDeptName = "";
-
+
+ // @FieldInfo(name = "deptName", type = "bit", explain = "部门(护卫点)")
+ @TableField(exist = false)
+ private String deptName = "";
+
@TableField(exist = false)
@ExcelField(value = "岗位")
private String newJobName= "";
@@ -97,7 +101,7 @@
@FieldInfo(name = "dimissionType", type = "varchar", explain = "离职类型")
@TableField("dimissionType")
// @ExcelField(value = "离职类型",writeConverterExp = "1=正常离职,2=自动离职,3=公司劝退,4=公司辞退,5=试用期内" )
- private String dimissionType = "1";
+ private String dimissionType;
//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
--
Gitblit v1.8.0