From 7e172d1de04d55caafd86489fa81c06c142adab2 Mon Sep 17 00:00:00 2001
From: Alan <1124498879@qq.com>
Date: 星期五, 19 二月 2021 17:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java
index 7c86b27..c99e9d9 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java
@@ -49,6 +49,10 @@
@FieldInfo(name = "empName", type = "varchar", explain = "员工姓名")
@TableField("empName")
private String empName = "";
+
+ @FieldInfo(name = "empStatus", type = "varchar", explain = "员工状态")
+ @TableField("empStatus")
+ private String empStatus = "";
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
@TableField("sex")
@@ -73,10 +77,18 @@
@FieldInfo(name = "jobName", type = "varchar", explain = "岗位名称")
@TableField("jobName")
private String jobName = "";
+
+ @FieldInfo(name = "attendYear", type = "varchar", explain = "离职考勤年份")
+ @TableField(exist = false)
+ private String attendYear = "";
- @FieldInfo(name = "attendMonth", type = "tinyint", explain = "离职考勤月份")
+ @FieldInfo(name = "attendMonth", type = "varchar", explain = "离职考勤月份")
@TableField("attendMonth")
- private Integer attendMonth = 0;
+ private String attendMonth = "";
+
+ @FieldInfo(name = "attendDays", type = "decimal", explain = "出勤天数")
+ @TableField("attendDays")
+ private BigDecimal attendDays = BigDecimal.ZERO;
@FieldInfo(name = "overtimeHour", type = "decimal", explain = "加班小时")
@TableField("overtimeHour")
@@ -132,5 +144,8 @@
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@TableField("remark")
private String remark = "";
+
+ @TableField(exist = false)
+ private String deductStr;
}
\ No newline at end of file
--
Gitblit v1.8.0