From 29c9ada64cee7adf3399e92ee3a62f2b9ed338ed Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 14 一月 2025 10:19:38 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

---
 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