From ba69a4fb6db917d5e4d0fb14c37add8ee859b0e1 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 13 三月 2026 17:57:51 +0800
Subject: [PATCH] 1.耗材迁移 2.仓储物流新增字段（毛重，皮重，净重） 3.设备保养多选（多条定时任务）

---
 src/main/java/com/ruoyi/common/utils/DateUtils.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/common/utils/DateUtils.java b/src/main/java/com/ruoyi/common/utils/DateUtils.java
index 04c87d8..0fa7e5a 100644
--- a/src/main/java/com/ruoyi/common/utils/DateUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/DateUtils.java
@@ -43,6 +43,15 @@
         return new Date();
     }
 
+    public static LocalDate toLocalDate(Date date){
+        if(date == null) return LocalDate.now();
+        // 2. 鎸囧畾鍥哄畾鏃跺尯杞崲锛堝涓滃叓鍖篣TC+8銆乁TC闆舵椂鍖猴級
+        return date.toInstant()
+                .atZone(ZoneId.of("Asia/Shanghai")) // 涓滃叓鍖猴紙鍖椾含/涓婃捣鏃跺尯锛�
+                // .atZone(ZoneId.of("UTC")) // 鍙�夛細UTC闆舵椂鍖�
+                .toLocalDate();
+    }
+
     /**
      * 鑾峰彇褰撳墠鏃ユ湡, 榛樿鏍煎紡涓簓yyy-MM-dd
      * 
@@ -147,7 +156,7 @@
     /**
      * 璁＄畻鏃堕棿宸�
      *
-     * @param endTime 鏈�鍚庢椂闂�
+     * @param endDate 鏈�鍚庢椂闂�
      * @param startTime 寮�濮嬫椂闂�
      * @return 鏃堕棿宸紙澶�/灏忔椂/鍒嗛挓锛�
      */

--
Gitblit v1.9.3