From 455bf65a36ce1e9b6c24eb5c86a8eb69eaea8003 Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期四, 04 三月 2021 00:19:47 +0800
Subject: [PATCH] 增加员工基本信息，工作经历的关联查询
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java | 7 +++++++
1 files changed, 7 insertions(+), 0 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 a4538ca..6e106e9 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
@@ -312,6 +312,13 @@
@ExcelField(value = "离职类型",writeConverterExp = "1=正常离职,2=自动离职,3=公司劝退,4=公司辞退,5=试用期内" )
private String dimissionType;
+ @FieldInfo(name = "entryType", type = "varchar", explain = "入职类型")
+ @TableField("entryType")
+ private String entryType = "01";
+
+ @FieldInfo(name = "entryTypeName", type = "varchar", explain = "入职类型")
+ @TableField(exist = false)
+ private String entryTypeName = "正常入职";
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
--
Gitblit v1.8.0