From 00f7864d745b3582e64fb6bbc0ddbc4c8d689fcd Mon Sep 17 00:00:00 2001 From: mash Date: Wed, 1 Feb 2023 11:49:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=9B=B8=E5=85=B3=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ydool/staff/entity/Personnel.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ydool/staff/entity/Personnel.java b/src/main/java/com/ydool/staff/entity/Personnel.java index 5d3978e..03115fa 100644 --- a/src/main/java/com/ydool/staff/entity/Personnel.java +++ b/src/main/java/com/ydool/staff/entity/Personnel.java @@ -3,6 +3,7 @@ package com.ydool.staff.entity; import java.math.BigDecimal; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ydool.common.base.BaseEntity; import java.util.Date; @@ -43,6 +44,7 @@ public class Personnel extends BaseEntity { private String gender; @ApiModelProperty(value = "出生日期") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date birthday; @ApiModelProperty(value = "身份证号") @@ -69,7 +71,7 @@ public class Personnel extends BaseEntity { @ApiModelProperty(value = "录用方式") private String hireType; - @ApiModelProperty(value = "执业资格证") + @ApiModelProperty(value = "执业资格证书") private String qualification; @ApiModelProperty(value = "专业技术职称") @@ -97,18 +99,23 @@ public class Personnel extends BaseEntity { private BigDecimal annualSalary; @ApiModelProperty(value = "入职时间") - private Date hireDate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date hiredate; @ApiModelProperty(value = "退休时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date retirementTime; @ApiModelProperty(value = "离职时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date resignationTime; @ApiModelProperty(value = "退休返聘开始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date txfpStartTime; @ApiModelProperty(value = "退休返聘结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date txfpEndTime; @ApiModelProperty(value = "人员招聘单号")