From d7b6f020d3b6cce69f19f5198da95513c5d57b32 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期二, 23 九月 2025 21:53:14 +0800
Subject: [PATCH] 1.系统管理中系统参数增加了将配置项写入缓存的功能 2.系统管理启动时将配置项写入缓存 3.员工基本信息增加了年假字段 4.员工基本信息服务增加了计算年假的功能
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java
index 3a53a27..bcc7a00 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionLog.java
@@ -54,9 +54,9 @@
@ExcelField(value = "部门(护卫点)")
private String allDeptName = "";
- // @FieldInfo(name = "deptName", type = "bit", explain = "部门(护卫点)")
- @TableField(exist = false)
- private String deptName = "";
+ @TableField("deptName")
+ @ExcelField(value = "部门/护卫点")
+ private String deptName;
@TableField(exist = false)
@ExcelField(value = "岗位")
@@ -138,6 +138,10 @@
@TableField(exist = false)
private String empIds;
+ @FieldInfo(name = "deptNames", explain = "关闭档案人员部门名称")
+ @TableField(exist = false)
+ private String deptNames;
+
@FieldInfo(name = "entryDates", explain = "关闭档案人员入职日期")
@TableField(exist = false)
private String entryDates;
--
Gitblit v1.8.0