From d42096fd55c4b0caf84bb4f208b4e17534e158c1 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 21 五月 2026 15:34:49 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/opo-qd
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
index 536cb3c..4e083cc 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/DateUtils.java
@@ -70,7 +70,11 @@
public static final String parseDateToStr(final String format, final Date date)
{
- return new SimpleDateFormat(format).format(date);
+ if(date==null){
+ return "";
+ }else {
+ return new SimpleDateFormat(format).format(date);
+ }
}
public static final Date dateTime(final String format, final String ts)
--
Gitblit v1.9.3