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/EmpLaborTrouble.java | 3 ++-
1 files changed, 2 insertions(+), 1 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 4dd81e0..177c543 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
@@ -123,7 +123,8 @@
@FieldInfo(name = "arbitrationStatus", type = "bit", explain = "仲裁状态")
@TableField("arbitrationStatus")
private Integer arbitrationStatus = 0;
-
+ @TableField(exist = false)
+ private String arbitrationStatusName ;
@FieldInfo(name = "settleDate", type = "date", explain = "案结日期")
@TableField("settleDate")
@JsonSerialize(using = DateSerializer.class)
--
Gitblit v1.8.0