From 9efb739152062fed7a1b073cbb0034d519283f2d Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期三, 19 二月 2020 13:36:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
java110-utils/src/main/java/com/java110/utils/util/DateUtil.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java b/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
index 3e7f3f0..be4bf39 100644
--- a/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
+++ b/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
@@ -16,7 +16,7 @@
private static DateFormat dateFormat = new SimpleDateFormat("yyyyMMddhhmmss");
- private static final String LAST_TIME = "2038-01-01 00:00:00";
+ public static final String LAST_TIME = "2038-01-01 00:00:00";
private static Map<String, SimpleDateFormat> formats = new HashMap();
public static final String DATE_FORMATE_STRING_DEFAULT = "yyyyMMddHHmmss";
@@ -387,4 +387,13 @@
}
return true;
}
+
+
+ public static int getCurrentMonthDay() {
+ Calendar a = Calendar.getInstance();
+ a.set(Calendar.DATE, 1);
+ a.roll(Calendar.DATE, -1);
+ int maxDate = a.get(Calendar.DATE);
+ return maxDate;
+ }
}
--
Gitblit v1.8.0