From f90d9f53beb844265c4153159aadb0baf81bafdb Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 30 七月 2026 18:07:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesRespVO.java |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesRespVO.java
index c2f11b0..8b8f429 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnsales/vo/MesWmReturnSalesRespVO.java
@@ -3,6 +3,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -23,23 +24,20 @@
     @Schema(description = "閫�璐у崟鍚嶇О", requiredMode = Schema.RequiredMode.REQUIRED, example = "閿�鍞��璐�")
     private String name;
 
+    @Schema(description = "閿�鍞鍗� ID", example = "1")
+    private Long saleOrderId;
+
     @Schema(description = "閿�鍞鍗曠紪鍙�", example = "SO202603010001")
     private String salesOrderCode;
 
     @Schema(description = "瀹㈡埛 ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Long clientId;
 
-    @Schema(description = "瀹㈡埛缂栫爜", example = "C001")
-    private String clientCode;
-
     @Schema(description = "瀹㈡埛鍚嶇О", example = "XX瀹㈡埛")
     private String clientName;
 
-    @Schema(description = "瀹㈡埛绠�绉�", example = "XX")
-    private String clientNickname;
-
     @Schema(description = "閫�璐ф棩鏈�")
-    private LocalDateTime returnDate;
+    private LocalDate returnDate;
 
     @Schema(description = "閫�璐у師鍥�", example = "璐ㄩ噺闂")
     private String returnReason;
@@ -53,4 +51,4 @@
     @Schema(description = "鍒涘缓鏃堕棿", requiredMode = Schema.RequiredMode.REQUIRED)
     private LocalDateTime createTime;
 
-}
+}
\ No newline at end of file

--
Gitblit v1.9.3