From a88a536514b0ee5fb863dd5c992279d5b86ad77f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 09 十二月 2024 18:18:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java | 24 ++++++++++++++++++++++++
1 files changed, 24 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 bf677d3..f3a4662 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
@@ -14,6 +14,9 @@
@ApiModelProperty(value = "订单id")
private Long id;
+ @ApiModelProperty(value = "订单状态")
+ private Integer orderStatus;
+
@ApiModelProperty(value = "订单商品")
private List<OrderGoodsVO> goodsList;
@@ -59,4 +62,25 @@
@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;
+
}
--
Gitblit v1.7.1