From 68e7d31bc6d6c4a84ffb4b423c1ccd211f16f949 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 15 一月 2025 09:29:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java |    6 ++++++
 1 files changed, 6 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 c6c1386..ad189f8 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
@@ -83,7 +83,13 @@
     @ApiModelProperty(value = "技师名称")
     private String technicianName;
 
+    @ApiModelProperty(value = "技师id")
+    private Integer technicianId;
+
     @ApiModelProperty(value = "预约单id")
     private String technicianSubscribeId;
 
+    @ApiModelProperty("核销码BASE64")
+    private String writeOffCode;
+
 }

--
Gitblit v1.7.1