From a988a89e6b0cd75a5df4691eb8196c0ef9513a05 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 19:46:42 +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 f3a4662..5a355ee 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 Integer distributionMode;
+ private String distributionMode;
@ApiModelProperty(value = "门店名称")
private String shopName;
@@ -83,4 +83,7 @@
@ApiModelProperty(value = "技师名称")
private String technicianName;
+ @ApiModelProperty(value = "预约单id")
+ private String technicianSubscribeId;
+
}
--
Gitblit v1.7.1