From 7d22ca5a1c9416e84430a3997664e17861a2951e Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 11 四月 2025 21:04:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/util/DateUtil.java | 9 ++++++++-
1 files changed, 8 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..8c70be0 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;
}
+
/**
* 毫秒转日期时间
*
@@ -329,4 +330,10 @@
return dt1.getTime();
}
+ public static Date addDay(Date paymentTime, int i) {
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(paymentTime);
+ calendar.add(Calendar.DATE, i);
+ return calendar.getTime();
+ }
}
--
Gitblit v1.7.1