From 6ca0f85f69b5a3d52d7d9cd755e032ae338f5a60 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 07 六月 2024 05:52:02 +0800
Subject: [PATCH] fix: 问题修复 1.员工档案中修改合同时性别不能自动带入问题
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.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/EmpContractInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
index e4bd062..b48fd74 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
@@ -79,10 +79,10 @@
@ExcelField(value = "合同结束日期", writeConverter = TimeConverter.class)
private Date endDate;
- @FieldInfo(name = "contractPeriod", type = "tinyint", explain = "合同期限(年)")
+ @FieldInfo(name = "contractPeriod", type = "varchar", explain = "合同期限(年)")
@TableField("contractPeriod")
@ExcelField(value = "合同期限(年)")
- private Float contractPeriod = Float.valueOf(0);
+ private String contractPeriod;
@FieldInfo(name = "contractStatusName", type = "varchar", explain = "合同状态")
@TableField(exist = false)
@@ -103,7 +103,7 @@
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
// @TableField("sex")
// @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
- @TableField(exist = false)
+ @TableField("sex")
private String sex = "";
//@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
--
Gitblit v1.8.0