From 5833f3f3aa5313fa1170cd9ab0c5857f964ba96c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 16 八月 2025 13:20:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs

---
 src/main/java/com/zy/asrs/entity/result/ZphjcdgzVo.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/result/ZphjcdgzVo.java b/src/main/java/com/zy/asrs/entity/result/ZphjcdgzVo.java
index b9ab790..471f467 100644
--- a/src/main/java/com/zy/asrs/entity/result/ZphjcdgzVo.java
+++ b/src/main/java/com/zy/asrs/entity/result/ZphjcdgzVo.java
@@ -12,6 +12,14 @@
 
     private Integer workNo; // 宸ヤ綔鍙�
 
+    // 鏈ㄧ绫诲瀷
+    private String boxType;
+
     private String position; // 瑕佹媶鐨勪綅缃�,宸︽垨鍙�
 
+    /**
+     * 鎷嗗灈绫诲瀷 1.鍑哄簱鐞嗚揣锛�2.绌洪棽鐞嗚揣
+     */
+    private Integer cdType;
+
 }

--
Gitblit v1.9.1