From 44e0f0472d8efa0646b20db8a40c16beab0b752e Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期六, 06 四月 2024 12:22:12 +0800
Subject: [PATCH] feat: 一些需求改进 打开档案时增加了部门选择项 处理了合同信息录入时的性别不自动填入问题 合同到期提醒模块发布

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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 1df8c06..a9804e9 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
@@ -252,9 +252,9 @@
     @TableField("InsuranceType")
     private String insuranceType = "";
 
-    @FieldInfo(name = "insuranceTypeName", type = "varchar", explain = "保险类型")
+    @FieldInfo(name = "insuranceTypeName", type = "varchar", explain = "社保档位")
     @TableField(exist = false)
-    @ExcelField(value = "保险类型")
+    @ExcelField(value = "社保档位")
     private String insuranceTypeName = "";
 
     @FieldInfo(name = "socialNumb", type = "varchar", explain = "社保电脑号")
@@ -313,7 +313,7 @@
 
     @FieldInfo(name = "entryType", type = "varchar", explain = "入职类型")
     @TableField("entryType")
-    private String entryType = "";
+    private String entryType;
 
     @FieldInfo(name = "entryTypeName", type = "varchar", explain = "入职类型")
     @TableField(exist = false)

--
Gitblit v1.8.0