From a533affac66b956b4285ed74261bdff7481133f6 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 25 二月 2021 14:05:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
index 75cb6b0..2b403f9 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpBaseInfo.java
@@ -338,6 +338,9 @@
@TableField("remark")
private String remark = "";
+ @TableField("imagePath")
+ private String imagePath;
+
@TableField(exist = false)
private String ageStr = "";
@@ -390,6 +393,8 @@
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date applayDate;
+
+
@TableField(exist = false)
private String reason;
@TableField(exist = false)
--
Gitblit v1.8.0