From d5eb955933d4c7dc1f102d8a688f7447b5a674fd Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 17 十一月 2025 09:30:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

---
 src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java b/src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java
index c095080..04d3445 100644
--- a/src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OrderDomainParam.java
@@ -1,6 +1,8 @@
 package com.zy.asrs.entity.param;
 
 import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.OrderDetlPakin;
+import com.zy.asrs.entity.OrderDetlPakout;
 import lombok.Data;
 
 import java.util.List;
@@ -16,8 +18,12 @@
     private Long docType;
 
     private String orderNo;
+    private String standby1;
+    private Integer ownerId;
 
     private List<OrderDetl> orderDetlList;
+    private List<OrderDetlPakin> orderDetlPakinList;
+    private List<OrderDetlPakout> orderDetlPakoutList;
 
 
 }

--
Gitblit v1.9.1