From a488088a18a9b8808bc57124681cee8c4ada7299 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期二, 10 三月 2026 17:23:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/PdaGeneralParam.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/PdaGeneralParam.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/PdaGeneralParam.java
index 290696d..d278257 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/PdaGeneralParam.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/params/PdaGeneralParam.java
@@ -1,6 +1,7 @@
 package com.vincent.rsf.server.api.entity.params;
 
 import com.vincent.rsf.server.manager.entity.LocItem;
+import com.vincent.rsf.server.manager.entity.TaskItem;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
@@ -33,4 +34,10 @@
 
     private String newContainerNo;
 
+    private List<TaskItem> taskItemList;
+
+    //鐏屾《鍏ュ簱
+    private String sta1;
+    private String sta2;
+
 }

--
Gitblit v1.9.1