From 4e55bd9cee8e44f7a7a0d9185d8323fc7be9193d Mon Sep 17 00:00:00 2001
From: yubo <autumnal_wind@yeah.net>
Date: 星期六, 11 四月 2026 21:14:01 +0800
Subject: [PATCH] fix(hr): 修正员工基础信息字典字段的大小写问题

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 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 ce8cab6..b0ef13a 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
@@ -86,7 +86,7 @@
     @ExcelField(value = "岗位名称")
     private String jobName = "";
 
-    @NotBlank(message = "{required}")
+    // @NotBlank(message = "{required}")
     @FieldInfo(name = "empType", type = "varchar", explain = "员工类别")
     @TableField("empType")
     @ExcelField(value = "员工类别", writeConverterExp = "1=正式工,2=临时工")
@@ -452,4 +452,8 @@
     @FieldInfo(name = "retirementReminded", type = "tinyint", explain = "是否已提醒退休。0-未提醒 1-已提醒")
     @TableField("retirementReminded")
     private Integer retirementReminded = 0;
+
+    @FieldInfo(name = "timeRange", type = "int", explain = "时间范围:0-当天 1-本周 2-本月 3-今年,默认2")
+    @TableField(exist = false)
+    private Integer timeRange;
 }

--
Gitblit v1.8.0