From b8d98797f162f34ce0e4245b0d879ea0e6a30db0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 26 一月 2019 18:15:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
utils/src/main/java/org/yeshi/utils/DateUtil.java | 38 +-------------------------------------
1 files changed, 1 insertions(+), 37 deletions(-)
diff --git a/utils/src/main/java/org/yeshi/utils/DateUtil.java b/utils/src/main/java/org/yeshi/utils/DateUtil.java
index 3cfbc90..ca60d74 100644
--- a/utils/src/main/java/org/yeshi/utils/DateUtil.java
+++ b/utils/src/main/java/org/yeshi/utils/DateUtil.java
@@ -95,42 +95,6 @@
}
}
-
- /**
- * 楠岃瘉鏄惁灞炰簬鍚屼竴澶�
- *
- * @param Date1
- * @param Date2
- * @return
- */
- public static boolean isSameMonth(Date date1, Date date2) {
- if (date1 != null && date2 != null) {
- Calendar cal1 = Calendar.getInstance();
- cal1.setTime(date1);
- Calendar cal2 = Calendar.getInstance();
- cal2.setTime(date2);
- return isSameMonth(cal1, cal2);
- } else {
- return false;
- }
- }
-
- /**
- * 楠岃瘉鏄惁灞炰簬鍚屽勾鍚屾湀
- *
- * @param cal1
- * @param cal2
- * @return
- */
- public static boolean isSameMonth(Calendar cal1, Calendar cal2) {
- if (cal1 != null && cal2 != null) {
- return cal1.get(0) == cal2.get(0) && cal1.get(1) == cal2.get(1) && cal1.get(6) == cal2.get(6);
- } else {
- return false;
- }
- }
-
-
/**
* 鎸囧畾鏃ユ湡鍔犱笂澶╂暟鍚庣殑鏃ユ湡
*
@@ -198,8 +162,8 @@
break; // 鏃堕棿缁撴潫
}
}
-
return listDate;
}
+
}
\ No newline at end of file
--
Gitblit v1.8.0