From 14c2d7fc17595c86e7fe70f2d25f93a7d2c0a635 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期日, 07 三月 2021 13:59:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java
index bd0836a..bac387d 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpInsurance.java
@@ -108,12 +108,15 @@
@TableField("reportStatus")
@ExcelField(value = "是否已报告", writeConverterExp = "0=未报告,1=已报告")
private Integer reportStatus = 0;
-
+ @TableField(exist = false)
+ private String reportStatusName ;
@FieldInfo(name = "applayStatus", type = "bit", explain = "申请状态 0-未申请 1-已申请")
@TableField("applayStatus")
@ExcelField(value = "申请状态", writeConverterExp = "0=未申请,1=已申请")
private Integer applayStatus = 0;
+ @TableField(exist = false)
+ private String applayStatusName ;
@FieldInfo(name = "auditor", type = "varchar", explain = "审核人")
@TableField("auditor")
@ExcelField(value = "审核人")
--
Gitblit v1.8.0