From 8d6a17ecf85faed505a5f8a95210a6b78bba2a64 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 29 一月 2026 14:31:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/services/src/main/java/com/doumee/core/utils/DateUtil.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/core/utils/DateUtil.java b/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
index 02efdb3..66505d9 100644
--- a/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
+++ b/server/services/src/main/java/com/doumee/core/utils/DateUtil.java
@@ -438,7 +438,7 @@
      * @return String
      * @throws Exception
      */
-    public static String getNowShortDate() throws Exception {
+    public static String getNowShortDate() {
         String nowDate = "";
         try {
             java.sql.Date date = null;
@@ -446,7 +446,7 @@
             nowDate = sdfShort.format(date);
             return nowDate;
         } catch (Exception e) {
-            throw e;
+            return  null;
         }
     }
 

--
Gitblit v1.9.3