From 84520a4f2f126271c6532cacf71beaedfc249be4 Mon Sep 17 00:00:00 2001
From: zlzw <583819556@qq.com>
Date: Mon, 25 Mar 2024 16:50:38 +0800
Subject: [PATCH] =?UTF-8?q?fix=20[=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8Fv2]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/yunbao/common/utils/DateFormatUtil.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/src/main/java/com/yunbao/common/utils/DateFormatUtil.java b/common/src/main/java/com/yunbao/common/utils/DateFormatUtil.java
index c880069..0e3c04a 100644
--- a/common/src/main/java/com/yunbao/common/utils/DateFormatUtil.java
+++ b/common/src/main/java/com/yunbao/common/utils/DateFormatUtil.java
@@ -93,7 +93,7 @@ public class DateFormatUtil {
                     }
                     break;
                 case 2014:
-                    if (year == yearCur) {
+                   /* if (year == yearCur) {
                         if (month == monthCur && weekInMonth == weekInMonthCur) {
                             formatDate = getWeekDay(context, calendardate.get(7));
                         } else {
@@ -101,10 +101,11 @@ public class DateFormatUtil {
                         }
                     } else {
                         formatDate = formatDate(date, "yyyy/M/d");
-                    }
+                    }*/
+                    formatDate = formatDate(date, "yyyy/M/d");
 
                     if (showTime) {
-                        formatDate = formatDate + " " + getTimeString(dateMillis, context);
+                        formatDate = formatDate ;//+ " " + getTimeString(dateMillis, context);
                     }
             }