From b7e12f6bfcf7d42169dffa5f169843e714833b6a Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 23 四月 2021 12:05:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
index 76a9b32..70b621b 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java
@@ -82,7 +82,7 @@
@FieldInfo(name = "contractPeriod", type = "tinyint", explain = "合同期限(年)")
@TableField("contractPeriod")
@ExcelField(value = "合同期限(年)")
- private Integer contractPeriod = 0;
+ private Float contractPeriod = Float.valueOf(0);
@FieldInfo(name = "contractStatusName", type = "varchar", explain = "合同状态")
@TableField(exist = false)
--
Gitblit v1.8.0