From b2dee2f787cb8e27417373d0a31ad39501017782 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期日, 27 二月 2022 09:21:29 +0800
Subject: [PATCH] fix(bug修复): 信息录入模块录入基本信息时的入职类型默认设置成新入职
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpContractInfo.java | 6 ++----
1 files changed, 2 insertions(+), 4 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 70b621b..42cb6c6 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
@@ -100,8 +100,6 @@
// @ExcelField(value = "员工状态",writeConverterExp = "0=在职,1=离职,2=退休" )
private String empStatus = "";
-
-
@FieldInfo(name = "sex", type = "varchar", explain = "性别码")
@TableField("sex")
// @ExcelField(value = "性别", writeConverterExp = "1=男,2=女")
@@ -138,7 +136,7 @@
@FieldInfo(name = "remark", type = "varchar", explain = "备注")
@TableField("remark")
-// @ExcelField(value = "备注")
+ @ExcelField(value = "备注")
private String remark = "";
//@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@@ -169,7 +167,7 @@
//@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
- @Version
+ // @Version
private Integer version = 0;
@TableField(exist = false)
--
Gitblit v1.8.0