diff --git a/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/vo/MesPlanDetailVo.java b/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/vo/MesPlanDetailVo.java index 6f0f7d4..3056385 100644 --- a/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/vo/MesPlanDetailVo.java +++ b/ruoyi-demo/src/main/java/com/ruoyi/mts/domain/vo/MesPlanDetailVo.java @@ -1,12 +1,15 @@ package com.ruoyi.mts.domain.vo; import java.util.Date; + +import cn.hutool.core.date.DatePattern; import com.fasterxml.jackson.annotation.JsonFormat; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import com.ruoyi.common.annotation.ExcelDictFormat; import com.ruoyi.common.convert.ExcelDictConvert; import lombok.Data; + import java.util.Date; import java.io.Serializable; @@ -50,21 +53,25 @@ public class MesPlanDetailVo implements Serializable { /** * 计划开始时间 */ + @JsonFormat(pattern = DatePattern.NORM_DATE_PATTERN) private Date planStartDate; /** * 计划结束时间 */ + @JsonFormat(pattern = DatePattern.NORM_DATE_PATTERN) private Date planEndDate; /** * 实际开始时间 */ + @JsonFormat(pattern = DatePattern.NORM_DATE_PATTERN) private Date actualStartDate; /** * 实际结束时间 */ + @JsonFormat(pattern = DatePattern.NORM_DATE_PATTERN) private Date actualEndDate; /** diff --git a/ruoyi-ui-vue3/src/views/mts/planDetail/index.vue b/ruoyi-ui-vue3/src/views/mts/planDetail/index.vue index 664571d..b1008b5 100644 --- a/ruoyi-ui-vue3/src/views/mts/planDetail/index.vue +++ b/ruoyi-ui-vue3/src/views/mts/planDetail/index.vue @@ -30,10 +30,10 @@ - - +