From 05bfce91a0e0bb7d5d663adb4dbb06e096bebf32 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 14 一月 2025 10:50:18 +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 |    8 +++++++-
 1 files changed, 7 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..03526cc 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,10 @@
     @ApiModelProperty(value = "技师名称")
     private String technicianName;
 
+    @ApiModelProperty(value = "技师id")
+    private Integer technicianId;
+
+    @ApiModelProperty(value = "预约单id")
+    private String technicianSubscribeId;
+
 }

--
Gitblit v1.7.1