From 71725ae55cf54fa85be46f748528e2339643945c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 23 六月 2025 14:42:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/OrderOutItemDto.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/OrderOutItemDto.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/OrderOutItemDto.java
index f013f8a..17feb1e 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/OrderOutItemDto.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/dto/OrderOutItemDto.java
@@ -4,18 +4,23 @@
 import com.vincent.rsf.server.manager.utils.Synchro;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
 import lombok.experimental.Delegate;
 
 import java.util.List;
 
+
 @Data
-public class OrderOutItemDto  {
-    @Delegate
+@Accessors(chain = true)
+public class OrderOutItemDto {
+
+    @Delegate(types = LocItem.class)
     private LocItem locItem;
 
-
     private List<staListDto> staNos;
 
+    private String siteNo;
+
     @Data
     public static class staListDto{
         private String staNo;

--
Gitblit v1.9.1