diff --git a/gear-oa/src/main/java/com/gear/oa/domain/GearSalaryRecords.java b/gear-oa/src/main/java/com/gear/oa/domain/GearSalaryRecords.java index 6ece278..f311e19 100644 --- a/gear-oa/src/main/java/com/gear/oa/domain/GearSalaryRecords.java +++ b/gear-oa/src/main/java/com/gear/oa/domain/GearSalaryRecords.java @@ -11,6 +11,7 @@ import java.math.BigDecimal; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.gear.common.core.domain.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; /** * 工资发放记录对象 gear_salary_records @@ -37,6 +38,7 @@ public class GearSalaryRecords extends BaseEntity { /** * 发薪月份(YYYY-MM-01) */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date payPeriod; /** * 基本工资 diff --git a/gear-oa/src/main/java/com/gear/oa/domain/bo/GearSalaryRecordsBo.java b/gear-oa/src/main/java/com/gear/oa/domain/bo/GearSalaryRecordsBo.java index ccc7b1f..8faca41 100644 --- a/gear-oa/src/main/java/com/gear/oa/domain/bo/GearSalaryRecordsBo.java +++ b/gear-oa/src/main/java/com/gear/oa/domain/bo/GearSalaryRecordsBo.java @@ -14,6 +14,7 @@ import java.util.List; import com.fasterxml.jackson.annotation.JsonFormat; import com.gear.common.core.domain.BaseEntity; +import org.springframework.format.annotation.DateTimeFormat; /** * 工资发放记录业务对象 gear_salary_records @@ -39,6 +40,7 @@ public class GearSalaryRecordsBo extends BaseEntity { /** * 发薪月份(YYYY-MM-01) */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date payPeriod; /** diff --git a/gear-oa/src/main/java/com/gear/oa/domain/vo/GearSalaryRecordsVo.java b/gear-oa/src/main/java/com/gear/oa/domain/vo/GearSalaryRecordsVo.java index 86804e1..2a34427 100644 --- a/gear-oa/src/main/java/com/gear/oa/domain/vo/GearSalaryRecordsVo.java +++ b/gear-oa/src/main/java/com/gear/oa/domain/vo/GearSalaryRecordsVo.java @@ -8,6 +8,8 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.gear.common.annotation.ExcelDictFormat; import com.gear.common.convert.ExcelDictConvert; import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + import java.util.Date; @@ -40,6 +42,7 @@ public class GearSalaryRecordsVo { * 发薪月份(YYYY-MM-01) */ @ExcelProperty(value = "发薪月份(YYYY-MM-01)") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date payPeriod; /**