From f4a69a925645fe0c84121fde76ec03aff1b07939 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 14 一月 2025 11:24:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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 5a355ee..833aa57 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
@@ -63,7 +63,7 @@
private BigDecimal paymentAmount;
@ApiModelProperty(value = "配送方式（1=自提，2=快递）")
- private String distributionMode;
+ private Integer distributionMode;
@ApiModelProperty(value = "门店名称")
private String shopName;
@@ -83,6 +83,9 @@
@ApiModelProperty(value = "技师名称")
private String technicianName;
+ @ApiModelProperty(value = "技师id")
+ private Integer technicianId;
+
@ApiModelProperty(value = "预约单id")
private String technicianSubscribeId;
--
Gitblit v1.7.1