fix(bug修复): 导出员工信息时相关证件的名称转换

luoyb

2021-04-15 df489701802ac39013a2d29c9b6e01e7f905bba7

 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;

/**
*
@@ -30,7 +24,7 @@
@TableName("t_position")
public class Position implements Serializable{

            @FieldInfo(name = "positionId",type = "bigint",explain = "岗位Id")
            @FieldInfo(name = "positionId",type = "varchar",explain = "岗位Id")
            @TableId(value = "positionId")
            private Long positionId=0L;

@@ -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;

}
}