From 830bb157b5e46a6c041d5f0c0a883a22e37cb0f7 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 19 三月 2026 10:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz-spring3.5' into devlop-phyz-spring3.5

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ContainerWaveDto.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ContainerWaveDto.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ContainerWaveDto.java
index aced56a..7279672 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ContainerWaveDto.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/dto/ContainerWaveDto.java
@@ -1,6 +1,6 @@
 package com.vincent.rsf.server.api.entity.dto;
 
-import com.vincent.rsf.server.manager.entity.AsnOrderItem;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
 import com.vincent.rsf.server.manager.entity.TaskItem;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
@@ -14,6 +14,7 @@
 public class ContainerWaveDto {
 
     private TaskItem taskItem;
-    private List<AsnOrderItem> asnOrderItems;
+    private List<WkOrderItem> wkOrderItems;
 
 }
+

--
Gitblit v1.9.1