From 363208403f2076fef350a7feaf236e6153f982be Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 10 一月 2025 09:19:28 +0800
Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1
---
server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
index 3e39c9f..2d9f2ef 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -1968,13 +1968,13 @@
}
/**
- * 寰楀埌褰撳墠鏃ユ湡鏃堕棿,鏍煎紡涓簓yyy-MM-dd hh:mm:ss.
+ * 寰楀埌褰撳墠鏃ユ湡鏃堕棿,鏍煎紡涓簓yyy-MM-dd HH:mm:ss.
*
* @return String
*/
public static String getCurrDateTime() {
Timestamp date = new Timestamp(System.currentTimeMillis());
- SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
return formatter.format(date);
}
@@ -2851,7 +2851,8 @@
// System.out.println(DateUtil.afterMinutesDate(-5));
- DateUtil.getBeforDays(new Date(),7);
+ System.out.println(DateUtil.getPlusTime2( new Date() ));
+ System.out.println(DateUtil.getPlusTime2(addMonthToDate(new Date(),3)));
// Date startTime = DateUtil.StringToDate("2024-05-01 08:00:00" ,"yyyy-MM-dd HH:mm:ss");
// Date endTime = DateUtil.StringToDate("2024-05-01 17:00:00" ,"yyyy-MM-dd HH:mm:ss");
@@ -3065,6 +3066,7 @@
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
calendar.add(Calendar.MONTH, num);//
+
return calendar.getTime();
}
--
Gitblit v1.9.3