From 63c7e9d7051ed6742eb7334346a53376b0247c29 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 01 四月 2021 09:46:03 +0800
Subject: [PATCH] 删除

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

diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
index eefeaa1..44be67a 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
@@ -315,7 +315,7 @@
     @TableField("entryType")
     private String entryType = "";
 
-    //@FieldInfo(name = "entryTypeName", type = "varchar", explain = "入职类型")
+    @FieldInfo(name = "entryTypeName", type = "varchar", explain = "入职类型")
     @TableField(exist = false)
     private String entryTypeName = "新入职";
 
@@ -366,6 +366,7 @@
 	@TableField(exist = false)
 	private String dimissionDateStr= "";
 
+	@FieldInfo(name = "dimissionTypeName", type = "varchar", explain = "离职类型")
     @TableField(exist = false)
     private String dimissionTypeName= "";
 
@@ -429,4 +430,8 @@
     @ExcelField(value = "护卫点(部门)")
     @TableField("allDeptName")
     private String  allDeptName = "";
+
+    // @FieldInfo(name = "dimissRemark", type = "varchar", explain = "离职备注")
+    // @TableField("dimissRemark")
+    // private String dimissRemark = "";
 }

--
Gitblit v1.8.0