From 9767770dfabddd7ebc57c8d323af566b9655fa3e Mon Sep 17 00:00:00 2001 From: gongzuming <gongzuming> Date: 星期二, 10 九月 2024 16:42:30 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' 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