From 0417d31de9980cbc1735daffffb308d050ce35b4 Mon Sep 17 00:00:00 2001
From: wfy <260536420@qq.com>
Date: 星期六, 18 九月 2021 16:47:52 +0800
Subject: [PATCH] Merge branch 'master' into wangfy-dev
---
java110-utils/src/main/java/com/java110/utils/util/DateUtil.java | 1 +
1 files changed, 1 insertions(+), 0 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
old mode 100644
new mode 100755
index ef58cef..b5ff030
--- a/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
+++ b/java110-utils/src/main/java/com/java110/utils/util/DateUtil.java
@@ -433,6 +433,7 @@
return dateStr;
}
+
public static int getYear() {
Date date = getCurrentDate();
Calendar calendar = Calendar.getInstance();
--
Gitblit v1.8.0