From 09d3c4a46e1b67415a716251acea7a1c592c8af7 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 18 八月 2026 09:00:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fix/hsy/20260811' into dev_business

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorRespVO.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorRespVO.java
index f3936b0..e6f0263 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorRespVO.java
@@ -3,7 +3,6 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Schema(description = "绠$悊鍚庡彴 - MES 渚涘簲鍟嗛��璐у崟 Response VO")
@@ -35,7 +34,7 @@
     private String vendorNickname;
 
     @Schema(description = "閫�璐ф棩鏈�")
-    private LocalDate returnDate;
+    private LocalDateTime returnDate;
 
     @Schema(description = "閫�璐у師鍥�", example = "璐ㄩ噺涓嶅悎鏍�")
     private String returnReason;

--
Gitblit v1.9.3