From 9dc0d681e17d735ff42195a29e6905f4ee9f01da Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 27 六月 2025 09:56:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/core/utils/DateUtil.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/core/utils/DateUtil.java b/server/service/src/main/java/com/doumee/core/utils/DateUtil.java
index be3b15b..065ac27 100644
--- a/server/service/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/service/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -3204,13 +3204,13 @@
public static void main(String[] args) throws Exception{
-// System.out.println(DateUtil.DateToStr(
-// DateUtil.afterDateByType(new Date(),1,-1),"yyyy-MM")
-// );
-
- System.out.println(DateUtil.getBetweenHours(DateUtil.fromStringToDate("yyyy-MM-dd HH:mm:ss","2025-05-26 10:46:43"),
- DateUtil.fromStringToDate("yyyy-MM-dd HH:mm:ss","2025-05-26 07:41:43")));
- ;
+ System.out.println(DateUtil.DateToStr(
+ DateUtil.afterDateByType(new Date(),1,-11),"yyyy-MM")
+ );
+//
+// System.out.println(DateUtil.getBetweenHours(DateUtil.fromStringToDate("yyyy-MM-dd HH:mm:ss","2025-05-26 10:46:43"),
+// DateUtil.fromStringToDate("yyyy-MM-dd HH:mm:ss","2025-05-26 07:41:43")));
+// ;
// System.out.println(DateUtil.getLongDateTime(new Date()));;
}
--
Gitblit v1.9.3