From a72d1a009bc4068e1ba2890a9730223b9528c2f2 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 26 二月 2021 21:23:21 +0800
Subject: [PATCH] Merge branch 'lybfixbug'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java
index 5673a0e..4dd81e0 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpLaborTrouble.java
@@ -101,6 +101,10 @@
@ExcelField(value = "仲裁类型", writeConverterExp = "01=未报告,02=民事纠纷,03=合同纠纷")
private String arbitrationType = "";
+ @FieldInfo(name = "arbitrationTypeName", type = "varchar", explain = "仲裁类型")
+ @TableField(exist = false)
+ private String arbitrationTypeName = "";
+
@FieldInfo(name = "arbitrationReason", type = "varchar", explain = "仲裁事由")
@TableField("arbitrationReason")
@ExcelField(value = "仲裁事由")
--
Gitblit v1.8.0