From 7aac89af7c8b8a633cb0a0c870e81724b0ec5def Mon Sep 17 00:00:00 2001 From: fwq <582742538@qq.com> Date: 星期五, 03 二月 2023 10:54:23 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/hx/util/DateUtil.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/hx/util/DateUtil.java b/src/main/java/com/hx/util/DateUtil.java index a52169c..ddefebf 100644 --- a/src/main/java/com/hx/util/DateUtil.java +++ b/src/main/java/com/hx/util/DateUtil.java @@ -455,7 +455,7 @@ * endTime姣攕tartTime澶氱殑澶╂暟 * @param startTime 鏈�灏忔椂闂� * @param endTime 鏈�澶ф椂闂� - * @return + * @return 杩斿洖 */ public static Integer differDay(Date startTime,Date endTime){ Calendar cal1 = Calendar.getInstance(); @@ -500,8 +500,7 @@ } /**鎶婄杞崲鎴怷澶鏃禭鍒哫绉�*/ - public static String getChineseStr(Integer second) - { + public static String getChineseStr(Integer second) { int day = 24 * 60 * 60; int hour = 60 * 60; int min = 60; @@ -695,6 +694,7 @@ cal.roll(Calendar.DATE, -1); return cal.getActualMaximum(Calendar.DATE); } + /**鑾峰彇鏈堜唤鐨勫ぉ鏁� * @param year 骞翠唤 * @param month 鏈堜唤 @@ -712,7 +712,7 @@ /**鑾峰彇鏈堜唤鐨勫ぉ鏁� * @param yearMonth 骞存湀 * @param format 鏃堕棿鏍煎紡 - * @return + * @return 杩斿洖 */ public static int getMonthDays(String yearMonth,String format) { SimpleDateFormat sdf = new SimpleDateFormat(format); -- Gitblit v1.8.0