From b0eb6f4e58e3cea22d70a3a50b91fd425fee4b93 Mon Sep 17 00:00:00 2001
From: du <1725534722@qq.com>
Date: Wed, 5 Mar 2025 15:18:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E4=BA=A7=E5=AD=97=E6=AE=B5=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/ruoyi/tc/entity/AssetCurrent.java     | 6 ++++--
 .../main/java/com/ruoyi/tc/entity/po/AssetCurrentCpPo.java  | 4 +++-
 .../main/java/com/ruoyi/tc/entity/po/AssetCurrentJyPo.java  | 4 +++-
 3 files changed, 10 insertions(+), 4 deletions(-)

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 dd10f60..45142d4 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 5c6ccbe..7275b91 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 48ad6ad..ca5c34e 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;
     /**
      * 是否是互联网系统（字典）