From 89ba4125856330a78425bc921530bde9dc6d8606 Mon Sep 17 00:00:00 2001
From: autumnal_wind@yeah.net <autumnal_wind@yeah.net>
Date: 星期四, 18 四月 2024 16:22:55 +0800
Subject: [PATCH] feat: 合同增加时写入了到期天数
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java | 10 +++++-----
1 files changed, 5 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 1df8c06..a2ceddd 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)
@@ -388,9 +388,9 @@
@TableField(exist = false)
private String contractStatus = "";
- @FieldInfo(name = "contractPeriod", type = "tinyint", explain = "合同期限(年)")
+ @FieldInfo(name = "contractPeriod", type = "varchar", explain = "合同期限(年)")
@TableField(exist = false)
- private Integer contractPeriod = 0;
+ private String contractPeriod;
@FieldInfo(name = "transactor", type = "varchar", explain = "合同办理人")
@TableField(exist = false)
--
Gitblit v1.8.0