From 68157f39e1d56ce2a44f80620bf33b7510cbb327 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期三, 18 六月 2025 16:55:09 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev

---
 zy-asrs-framework/src/main/java/com/zy/asrs/framework/common/DateUtils.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/common/DateUtils.java b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/common/DateUtils.java
index 565ab70..7791886 100644
--- a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/common/DateUtils.java
+++ b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/common/DateUtils.java
@@ -86,6 +86,13 @@
         return daysPoint1;
     }
 
+    public static String format(Date date, String pattern){
+        if (date == null){
+            return "";
+        }
+       return new SimpleDateFormat(pattern).format(date);
+    }
+
     /**
      * 鍏ュ弬date璺濈鐜板湪鐨勭鏁�
      */

--
Gitblit v1.9.1