From 257d66798aa538f8737980f13d94c547bf0b51ea Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 15 一月 2025 15:37:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java
index e5764e5..764513a 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java
@@ -62,4 +62,37 @@
@ApiModelProperty(value = "实际支付价格")
private BigDecimal paymentAmount;
+ @ApiModelProperty(value = "配送方式（1=自提，2=快递）")
+ private Integer distributionMode;
+
+ @ApiModelProperty(value = "门店名称")
+ private String shopName;
+
+ @ApiModelProperty(value = "门店地址")
+ private String shopAddress;
+
+ @ApiModelProperty(value = "经度")
+ private String longitude;
+
+ @ApiModelProperty(value = "纬度")
+ private String latitude;
+
+ @ApiModelProperty(value = "门店id")
+ private Integer shopId;
+
+ @ApiModelProperty(value = "技师名称")
+ private String technicianName;
+
+ @ApiModelProperty(value = "技师id")
+ private Integer technicianId;
+
+ @ApiModelProperty(value = "预约单id")
+ private String technicianSubscribeId;
+
+ @ApiModelProperty("核销码BASE64")
+ private String writeOffCode;
+
+ @ApiModelProperty("最新快递信息")
+ private String express;
+
}
--
Gitblit v1.7.1