From 8cfc0759f49ba2e8493980789e6369249ac56493 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期一, 08 三月 2021 07:39:58 +0800
Subject: [PATCH] fix(bug修复): 系统管理、员工信息
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java
index e94458e..c80b0db 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/entity/EmpResign.java
@@ -35,11 +35,11 @@
public class EmpResign implements Serializable {
private static final long serialVersionUID = -4692256235815402125L;
- @FieldInfo(name = "resignId", type = "bigint", explain = "辞职Id")
+ //@FieldInfo(name = "resignId", type = "bigint", explain = "辞职Id")
@TableId(value = "resignId")
private Long resignId = 0L;
- @FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
+ //@FieldInfo(name = "empId", type = "bigint", explain = "员工Id")
@TableField("empId")
private Long empId = 0L;
@@ -63,7 +63,7 @@
@ExcelField(value = "证件号码")
private String certificateNumb = "";
- @FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
+ //@FieldInfo(name = "deptId", type = "bigint", explain = "部门Id")
@TableField("deptId")
private Long deptId = 0L;
@@ -72,7 +72,7 @@
@ExcelField(value = "部门名称")
private String deptName = "";
- @FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
+ //@FieldInfo(name = "JobId", type = "bigint", explain = "岗位Id")
@TableField("JobId")
private Long jobId = 0L;
@@ -99,33 +99,33 @@
@ExcelField(value = "事由")
private String reason = "";
- @FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
+ //@FieldInfo(name = "createTime", type = "datetime", explain = "记录创建时间")
@TableField("createTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
+ //@FieldInfo(name = "creator", type = "varchar", explain = "记录创建人")
@TableField("creator")
private String creator = "";
- @FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
+ //@FieldInfo(name = "modifyTime", type = "datetime", explain = "记录最后更新时间")
@TableField("modifyTime")
@JsonSerialize(using = DateTimeSerializer.class)
@JsonDeserialize(using = DateTimeDeserializer.class)
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date modifyTime;
- @FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
+ //@FieldInfo(name = "modifier", type = "varchar", explain = "记录最后更新人")
@TableField("modifier")
private String modifier = "";
- @FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
+ //@FieldInfo(name = "delFlag", type = "bit", explain = "记录删除标志。0-未删除 1-已删除，默认0")
@TableField("delFlag")
private Integer delFlag = 0;
- @FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
+ //@FieldInfo(name = "version", type = "int", explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
@Version
private Integer version = 0;
@@ -140,4 +140,4 @@
@TableField(exist = false)
private String empStatus;
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0