From 032f7c07e272dae9a857ed76b480dc391dc4073f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 12 三月 2024 14:18:47 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/util/DateUtil.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/util/DateUtil.java b/cloud-server-activity/src/main/java/com/dsh/activity/util/DateUtil.java
index 90a8673..f518e50 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/util/DateUtil.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/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