From 55373437850a796b401dbcd2d6c7ac0c1300053f Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 21 八月 2026 09:09:23 +0800
Subject: [PATCH] Merge branch 'dev_business' of http://114.132.189.42:9002/r/mom-pro2-after into dev_business

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/MesWmReturnVendorRespVO.java |    6 ++++--
 1 files changed, 4 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..63797fd 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")
@@ -18,6 +17,9 @@
 
     @Schema(description = "閫�璐у崟鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "渚涘簲鍟嗛��璐�")
     private String name;
+
+    @Schema(description = "閲囪喘璁㈠崟缂栧彿", example = "1")
+    private Long purchaseOrderId;
 
     @Schema(description = "閲囪喘璁㈠崟缂栧彿", example = "PO20250226001")
     private String purchaseOrderCode;
@@ -35,7 +37,7 @@
     private String vendorNickname;
 
     @Schema(description = "閫�璐ф棩鏈�")
-    private LocalDate returnDate;
+    private LocalDateTime returnDate;
 
     @Schema(description = "閫�璐у師鍥�", example = "璐ㄩ噺涓嶅悎鏍�")
     private String returnReason;

--
Gitblit v1.9.3