From 6d05ae432c4d76e521e031a76232a6dd1b0ff105 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期二, 09 三月 2021 09:20:27 +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, 5 insertions(+), 4 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 9e83cae..6b56ee1 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
@@ -314,11 +314,11 @@
@FieldInfo(name = "entryType", type = "varchar", explain = "入职类型")
@TableField("entryType")
- private String entryType = "01";
+ private String entryType = "";
//@FieldInfo(name = "entryTypeName", type = "varchar", explain = "入职类型")
@TableField(exist = false)
- private String entryTypeName = "正常入职";
+ private String entryTypeName = "新入职";
//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@@ -410,11 +410,12 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date applayDate;
-
-
@TableField(exist = false)
private String reason;
@TableField(exist = false)
private String reporter;
+ @FieldInfo(name = "baseKey", type = "varchar", explain = "查询关键词")
+ @TableField(exist = false)
+ private String baseKey;
}
--
Gitblit v1.8.0