From c979b4824ab9a28392696dc829cd01f65b54e83b Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期日, 21 二月 2021 17:08:06 +0800
Subject: [PATCH] 增加导入员工其它信息

---
 febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpOccupational.java |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 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 e54d053..828a8c6 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
@@ -271,6 +271,19 @@
     @TableField("remark")
     private String remark = "";
     
+    @FieldInfo(name = "expenseReport", type = "varchar", explain = "报单号")
+    @TableField("expenseReport")
+    @ExcelField(value = "报单号")
+    private String expenseReport = "";
+    
+    @FieldInfo(name = "settleDate", type = "date", explain = "案结日期")
+    @TableField("settleDate")
+    @JsonSerialize(using = DateSerializer.class)
+    @JsonDeserialize(using = DateDeSerializer.class)
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @ExcelField(value = "案结日期", writeConverter = TimeConverter.class)
+    private Date settleDate;
+    
     @TableField(exist = false)
 	private String hrDoDateStr= "";
     

--
Gitblit v1.8.0