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 | 5 -----
1 files changed, 0 insertions(+), 5 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 ba0037b..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
@@ -307,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