From bc9bd69850c95dacb22c7da4777a1d0470c33722 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <cuizf@fengyuntec.com>
Date: 星期日, 08 九月 2024 16:23:55 +0800
Subject: [PATCH] Merge branch 'master' into master-v2

---
 src/main/java/com/mzl/flower/dto/response/payment/OrderCheckListDTO.java |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/mzl/flower/dto/response/payment/OrderCheckListDTO.java b/src/main/java/com/mzl/flower/dto/response/payment/OrderCheckListDTO.java
index 24c9cbc..2ba18f0 100644
--- a/src/main/java/com/mzl/flower/dto/response/payment/OrderCheckListDTO.java
+++ b/src/main/java/com/mzl/flower/dto/response/payment/OrderCheckListDTO.java
@@ -15,9 +15,13 @@
 
     private String partnerName;//合伙人名称
 
+    private Long warehouseId;//仓库id
+
     @ApiModelProperty(value = "仓库名称")
     private String warehouseName;
 
+    private Long warehouseLocationId;//库位id
+
     @ApiModelProperty(value = "库位名称")
     private String warehouseLocationCode;
 

--
Gitblit v1.9.3