From 8e79771fd46206cdb6fb698f5dc78dc41886238f Mon Sep 17 00:00:00 2001 From: cmg <527198563@qq.com> Date: 星期一, 27 五月 2024 14:29:23 +0800 Subject: [PATCH] Merge branch 'matesr-prod-new' into master-stander --- src/main/java/com/hx/util/DateUtil.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/hx/util/DateUtil.java b/src/main/java/com/hx/util/DateUtil.java index 5b9a6c6..33b8d66 100644 --- a/src/main/java/com/hx/util/DateUtil.java +++ b/src/main/java/com/hx/util/DateUtil.java @@ -573,7 +573,7 @@ /** * 鑾峰彇褰撳墠鏈堢殑缁撴潫鏃堕棿 * @param date 鐐瑰墠鏃堕棿 - * @return 杩斿洖鏃堕棿 鏍煎紡yyyy-MM-dd 23:59:59 + * @return 杩斿洖鏃堕棿 鏍煎紡yyyy-MM-dd 23:59:59999 */ public static Date getMonthEnd(Date date) { Calendar calendar = Calendar.getInstance(); @@ -637,7 +637,7 @@ /** * 鑾峰彇褰撳墠骞寸殑缁撴潫鏃堕棿 * @param time 鏃堕棿 - * @return 杩斿洖鏃堕棿 鏍煎紡yyyy-MM-dd 23:59:59 + * @return 杩斿洖鏃堕棿 鏍煎紡yyyy-MM-dd 23:59:59999 */ public static Date getYearEnd(Date time) { Calendar calendar = Calendar.getInstance(); -- Gitblit v1.8.0