From a7e0682010b832c504f9ff7129dae36316f2f946 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 19 六月 2025 16:12:45 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem

---
 src/main/java/com/whyc/util/ThreadLocalUtil.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/whyc/util/ThreadLocalUtil.java b/src/main/java/com/whyc/util/ThreadLocalUtil.java
index c41c568..4507ed3 100644
--- a/src/main/java/com/whyc/util/ThreadLocalUtil.java
+++ b/src/main/java/com/whyc/util/ThreadLocalUtil.java
@@ -53,6 +53,12 @@
         return timeStr;
     }
 
+    /**
+     *
+     * @param timeFormat
+     * @param date
+     * @return
+     */
     public static String format(String timeFormat,Date date) {
         ThreadLocal<SimpleDateFormat> formatThreadLocal = ThreadLocal.withInitial(() -> new SimpleDateFormat(timeFormat));
         SimpleDateFormat format = formatThreadLocal.get();

--
Gitblit v1.9.1