From 906f38b1427bd6ee6506723e5d2ae09137dbbe5b Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期五, 26 二月 2021 00:25:17 +0800
Subject: [PATCH] 年龄查询改成或的关系
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.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/EmpDimissionAttend.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpDimissionAttend.java
index 307da65..edd0c56 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
@@ -118,10 +118,10 @@
@ExcelField(value = "请假（天）")
private BigDecimal leaveDay = BigDecimal.ZERO;
- @FieldInfo(name = "deduct", type = "decimal", explain = "有无代扣款项")
+ @FieldInfo(name = "deduct", type = "varchar", explain = "有无代扣款项")
@TableField("deduct")
@ExcelField(value = "有无代扣款项")
- private BigDecimal deduct = BigDecimal.ZERO;
+ private String deduct = "";
@FieldInfo(name = "absenteeism", type = "decimal", explain = "旷工（天）")
@TableField("absenteeism")
--
Gitblit v1.8.0