From a332ffab46b0d30e85b73ec023aa4e30c7b69e52 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期五, 12 三月 2021 02:36:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java | 9 ++++++++-
1 files changed, 8 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 27a2dd3..b9ac15a 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
@@ -49,7 +49,7 @@
@ExcelField(value = "档案号")
private String archivesNumb = "";
- //@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@TableField("deptId")
private Long deptId = 0L;
@@ -422,4 +422,11 @@
@FieldInfo(name = "empStatusName", type = "varchar", explain = "员工状态")
@TableField(exist = false)
private String empStatusName = "";
+
+ @TableField(exist = false)
+ private String inOutType;
+
+ @FieldInfo(name = "allDeptName", type = "varchar", explain = "部门全称")
+ @TableField("allDeptName")
+ private String allDeptName = "";
}
--
Gitblit v1.8.0