From b93e064edca77aa03e89b8803d2705762c7f8c26 Mon Sep 17 00:00:00 2001
From: MichaelWin <MichaelWin715@gamil.com>
Date: Fri, 26 Dec 2025 23:14:08 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=94=B9=E8=BF=9B=E3=80=91=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E4=B8=8E=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/corewing/app/common/base/CommonEntity.java  |  3 +++
 src/main/java/com/corewing/app/util/DateUtils.java  | 13 ++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/corewing/app/common/base/CommonEntity.java b/src/main/java/com/corewing/app/common/base/CommonEntity.java
index d737d72..5673920 100644
--- a/src/main/java/com/corewing/app/common/base/CommonEntity.java
+++ b/src/main/java/com/corewing/app/common/base/CommonEntity.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -21,6 +22,7 @@ public class CommonEntity implements Serializable {
     private String deleteFlag;
 
     /** 创建时间 */
+    @ApiModelProperty("创建时间")
     @TableField(fill = FieldFill.INSERT)
     private Date createTime;
 
@@ -33,6 +35,7 @@ public class CommonEntity implements Serializable {
     private String createUserName;
 
     /** 更新时间 */
+    @ApiModelProperty("更新时间")
     @TableField(fill = FieldFill.UPDATE)
     private Date updateTime;
 
diff --git a/src/main/java/com/corewing/app/util/DateUtils.java b/src/main/java/com/corewing/app/util/DateUtils.java
index 9b179e1..570000e 100644
--- a/src/main/java/com/corewing/app/util/DateUtils.java
+++ b/src/main/java/com/corewing/app/util/DateUtils.java
@@ -1,14 +1,21 @@
 package com.corewing.app.util;
 
+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Date;
 
 public class DateUtils {
 
     // 格式化LocalDateTime为字符串
-    public static String format(LocalDateTime time, String pattern) {
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
-        return time.format(formatter);
+    public static String format(Date time, String pattern) {
+        if (time == null || pattern == null || pattern.isEmpty()) {
+            return "";
+        }
+        // 创建SimpleDateFormat实例
+        SimpleDateFormat sdf = new SimpleDateFormat(pattern);
+        // 格式化日期为字符串
+        return sdf.format(time);
     }
 
 }