From 3cadfe55e0dcec2a02786956ad2776258e0e736c Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 19 九月 2024 19:27:05 +0800
Subject: [PATCH] fix: 问题修复 1.合同提醒时间范围

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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 e9cb38e..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,7 +79,7 @@
     @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 String contractPeriod;
@@ -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