From 68a3e4c053d15961ede69fe7698f63fe827624c3 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期一, 13 九月 2021 16:08:44 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into auth
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 7570360..a69c65d 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
@@ -758,6 +758,12 @@
return instance.get(Calendar.MONTH);
}
+ public static int getYear(Date date) {
+ Calendar instance = Calendar.getInstance();
+ instance.setTime(date);
+ return instance.get(Calendar.YEAR);
+ }
+
public static boolean before(Date start, Date end) {
Calendar date1 = Calendar.getInstance();
date1.setTime(start);
@@ -883,6 +889,5 @@
// Date after = new Date();
// System.out.println(getFirstDayOfMonthString());
// System.out.println(getDayOfMonthString());
-
}
}
--
Gitblit v1.7.1