diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetCurrent.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetCurrent.java index 12fcec5..c48a72e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetCurrent.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetCurrent.java @@ -1,6 +1,7 @@ package com.ruoyi.tc.entity; import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import com.ruoyi.tc.baseClass.BaseClass; import com.ruoyi.tc.entity.request.Acomma; @@ -190,8 +191,9 @@ public class AssetCurrent extends BaseClass implements Serializable { */ //@NotBlank @ApiModelProperty("使用时间") - @Excel(name = "使用时间", sort = 123, dateFormat = "yyyy:mm:dd hh:mm:ss") - @DateTimeFormat(pattern = "yyyy:mm:dd hh:mm:ss") + @Excel(name = "使用时间", sort = 123, dateFormat = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date sysj; /** * 是否是互联网系统(字典) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentCpPo.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentCpPo.java index 391dbad..2ed1def 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentCpPo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentCpPo.java @@ -1,6 +1,7 @@ package com.ruoyi.tc.entity.po; import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import com.ruoyi.tc.baseClass.BaseClass; import com.ruoyi.tc.entity.request.Acomma; @@ -162,7 +163,8 @@ public class AssetCurrentCpPo extends BaseClass implements Serializable { */ @ApiModelProperty("使用时间") - @DateTimeFormat(pattern = "yyyy:mm:dd hh:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date sysj; /** * 是否是互联网系统(字典) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentJyPo.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentJyPo.java index a30575e..a9deed9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentJyPo.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentJyPo.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; import com.ruoyi.tc.baseClass.BaseClass; import com.ruoyi.tc.entity.request.Acomma; @@ -181,7 +182,8 @@ public class AssetCurrentJyPo extends BaseClass implements Serializable { @NotNull @ApiModelProperty("使用时间") @Excel(name = "使用时间", sort = 116) - @DateTimeFormat(pattern = "yyyy:mm:dd hh:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date sysj; /** * 是否是互联网系统(字典)