From ce4b6a8e4c11a869f5707eef053488c62fb97eed Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 17 六月 2021 14:41:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_screen' into test_screen
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java
index 9c7f6fe..deddc1a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java
@@ -33,6 +33,8 @@
public static DateTimeFormatter format_ymd_String = DateTimeFormatter.ofPattern("yyMMdd");
+ public static SimpleDateFormat yyyyMM_format = new SimpleDateFormat("yyyy-MM");
+
/**
@@ -691,6 +693,16 @@
return date1.getTime();
}
+ public static Date parseDateYM(String str) {
+ try {
+ return yyyyMM_format.parse(str);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+
public static int getMonth(Date date){
Calendar instance = Calendar.getInstance();
instance.setTime(date);
--
Gitblit v1.7.1