From 512915919284d363b6a07fd6c9c54f145402fb0a Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期三, 10 三月 2021 02:55:53 +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 | 3 +++
1 files changed, 3 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 27a2dd3..a707e6a 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
@@ -422,4 +422,7 @@
@FieldInfo(name = "empStatusName", type = "varchar", explain = "员工状态")
@TableField(exist = false)
private String empStatusName = "";
+
+ @TableField(exist = false)
+ private String inOutType;
}
--
Gitblit v1.8.0