From 1b9a01bf5000714b08a75a50dd1f5f3eab65d888 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 08 十二月 2023 17:18:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-competition/src/main/java/com/dsh/competition/util/DateUtil.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/util/DateUtil.java b/cloud-server-competition/src/main/java/com/dsh/competition/util/DateUtil.java
index 298bae8..c76b942 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/util/DateUtil.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/util/DateUtil.java
@@ -150,7 +150,7 @@
*/
public static Date parse(String date, String pattern) {
try {
- if(Objects.nonNull(date)) {
+ if (Objects.nonNull(date)) {
return DateUtils.parseDate(date, pattern);
}
} catch (ParseException e) {
@@ -286,6 +286,7 @@
Calendar cal = Calendar.getInstance();
return cal;
}
+
/**
* 毫秒转日期时间
*
--
Gitblit v1.7.1