From 54130a901757db72ae1d7c8d20cdfc2123749244 Mon Sep 17 00:00:00 2001 From: MrShi <1878285526@qq.com> Date: 星期三, 25 六月 2025 10:06:09 +0800 Subject: [PATCH] Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/yunyibao 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