From 47a63dcdcd1889bd806208dc79937cd8112b8e38 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 19 十一月 2024 16:41:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
index c03cf47..a879505 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -460,7 +460,7 @@
* @return String
* @throws Exception
*/
- public static String getPlusTime(Date date) throws Exception {
+ public static String getPlusTime(Date date) {
if (date == null)
return null;
try {
@@ -1638,6 +1638,13 @@
return "";
}
}
+ public static String getFirstDayCurrentMonth() {
+ try {
+ return getDateLong(new Date()).substring(0, 7) + "-01";
+ } catch (Exception e) {
+ return "";
+ }
+ }
/**
* 灏唝yyyMM鍚勫紡杞崲鎴恲yyy骞碝M鏈堟牸寮�
--
Gitblit v1.9.3