From 63de9a0489ad9264fcd62dc0ac8791a6ec33874b Mon Sep 17 00:00:00 2001
From: Alan <1124498879@qq.com>
Date: 星期五, 19 二月 2021 17:33:40 +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 | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 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 111cf3c..11f46aa 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
@@ -258,6 +258,11 @@
+ @FieldInfo(name = "dimissionType", type = "varchar", explain = "离职类型")
+ @TableField("dimissionType")
+ private String dimissionType;
+
+
@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@JsonSerialize(using = DateTimeSerializer.class)
@@ -288,7 +293,11 @@
@TableField("version")
@Version
private Integer version = 0;
-
+
+ @FieldInfo(name = "remark", type = "varchar", explain = "离职备注")
+ @TableField("remark")
+ private String remark = "";
+
@TableField(exist = false)
private String ageStr = "";
@@ -298,13 +307,8 @@
@TableField(exist = false)
private String dimissionDateStr= "";
- @FieldInfo(name = "dimissionType", type = "varchar", explain = "离职类型")
- @TableField("dimissionType")
- private String dimissionType = "";
-
@TableField(exist = false)
private String dimissionTypeName= "";
-
@FieldInfo(name = "beginDate", type = "date", explain = "开始日期")
@TableField(exist = false)
--
Gitblit v1.8.0