From 16217be9c85f95cb236e639da6e546bb38cdc53d Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 05 十二月 2024 14:45:07 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java | 4 +++- 1 files changed, 3 insertions(+), 1 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..63a30b8 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 @@ -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