From e7a251566e481408e67e8475de29b5d442a5d703 Mon Sep 17 00:00:00 2001
From: rx <auster_i@163.com>
Date: 星期二, 24 九月 2024 15:36:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/rx_basefun_提货单优化' into master-xlk-test

---
 phi-warehouse-feign/src/main/java/com/hx/warehouse/dto/order/stock/StockChangeItemDto.java |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/phi-warehouse-feign/src/main/java/com/hx/warehouse/dto/order/stock/StockChangeItemDto.java b/phi-warehouse-feign/src/main/java/com/hx/warehouse/dto/order/stock/StockChangeItemDto.java
index 0535219..853d2fd 100644
--- a/phi-warehouse-feign/src/main/java/com/hx/warehouse/dto/order/stock/StockChangeItemDto.java
+++ b/phi-warehouse-feign/src/main/java/com/hx/warehouse/dto/order/stock/StockChangeItemDto.java
@@ -16,4 +16,24 @@
 
     /*********濡傛灉StockChangeDto涓璫ommonType鍊兼槸鎻愯揣鍗曞嚭搴撶被鍨�,鍒欎笅闈㈡槸蹇呭~,濉彁璐у瓙鍗曠殑鏍囪瘑*************************/
     private String commonId;
+
+    /*********鎻愯揣鍗曞垏鎹㈡寚瀹氬晢鍝�*************************/
+    private String actualConsumablesId;
+    private Integer actualOutNum;
+
+    /**棰嗙敤绉戝鏍囪瘑(绉戝琛�)*/
+    private String roomId;
+    /**棰嗙敤绉戝鍚�*/
+    private String roomName;
+    /**棰嗙敤閮ㄩ棬鏍囪瘑(閮ㄩ棬琛�)*/
+    private String departmentId;
+    /**棰嗙敤閮ㄩ棬鍚�*/
+    private String departmentName;
+    /**棰嗙敤浜烘爣璇�(鍛樺伐)*/
+    private String receiver;
+    /**棰嗙敤浜哄悕*/
+    private String receiverName;
+    /**鍏宠仈鐨勫叕鍏辨爣璇嗘彁璐у崟ID*/
+    private String remarks;
+
 }
\ No newline at end of file

--
Gitblit v1.8.0