From cc5d37f9636138adb1dc490764fdd41a701591f5 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 07 三月 2021 00:27:44 +0800
Subject: [PATCH] fix(bug修复): 员工智搜增加员工类型搜索项
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java
index 828a8c6..28b2a44 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java
@@ -132,10 +132,10 @@
@ExcelField(value = "是否住院", writeConverterExp = "0=未住院,1=已住院")
private Integer hospitalizatioFlag = 0;
- @FieldInfo(name = "bedNumb", type = "tinyint", explain = "床号")
+ @FieldInfo(name = "bedNumb", type = "varchar", explain = "床号")
@TableField("bedNumb")
@ExcelField(value = "床号")
- private Integer bedNumb = 0;
+ private String bedNumb = "";
@FieldInfo(name = "reportTime", type = "datetime", explain = "报案时间")
@TableField("reportTime")
@@ -290,4 +290,7 @@
@TableField(exist = false)
private String injuredTimeStr= "";
+ @FieldInfo(name = "settleStatusName", type = "bit", explain = "结案状态 0-未结案 1-已结案")
+ @TableField(exist = false)
+ private String settleStatusName = "";
}
\ No newline at end of file
--
Gitblit v1.8.0