From b622ca077cd6a4e35c1476d497999538b3720e1a Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 25 三月 2021 00:12:54 +0800
Subject: [PATCH] feat(员工其它信息): 员工档案中的其它信息按时间顺序排序
---
febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Position.java | 25 ++++++-------------------
1 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Position.java b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Position.java
index 101ceea..f44231e 100644
--- a/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Position.java
+++ b/febs-common/febs-common-core/src/main/java/cc/mrbird/febs/common/core/entity/system/Position.java
@@ -1,20 +1,14 @@
package cc.mrbird.febs.common.core.entity.system;
-import java.io.Serializable;
-import java.util.Date;
import cc.mrbird.febs.common.core.annotation.FieldInfo;
-import cc.mrbird.febs.common.core.utils.DateDeSerializer;
-import cc.mrbird.febs.common.core.utils.DateSerializer;
-import cc.mrbird.febs.common.core.utils.DateTimeDeserializer;
-import cc.mrbird.febs.common.core.utils.DateTimeSerializer;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.Version;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
/**
*
@@ -32,7 +26,7 @@
@FieldInfo(name = "positionId",type = "varchar",explain = "岗位Id")
@TableId(value = "positionId")
- private String positionId;
+ private Long positionId=0L;
@FieldInfo(name = "positionName",type = "varchar",explain = "岗位名称")
@TableField("positionName")
@@ -48,9 +42,6 @@
@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 = "记录创建人")
@@ -59,9 +50,6 @@
@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 = "记录最后更新人")
@@ -72,9 +60,8 @@
@TableField("delFlag")
private Integer delFlag=0;
- @FieldInfo(name = "version",type = "int",explain = "记录版本号，用来进行乐观锁控制")
@TableField("version")
@Version
private Integer version=0;
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0