From 5c620de6f56977c1e0f3ad461b88c0188d2eeeab Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期六, 08 二月 2025 18:20:17 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java | 11 ++++++++++- 1 files changed, 10 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 90b81f8..764513a 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,16 @@ @ApiModelProperty(value = "技师名称") private String technicianName; + @ApiModelProperty(value = "技师id") + private Integer technicianId; + @ApiModelProperty(value = "预约单id") - private Long technicianSubscribeId; + private String technicianSubscribeId; + + @ApiModelProperty("核销码BASE64") + private String writeOffCode; + + @ApiModelProperty("最新快递信息") + private String express; } -- Gitblit v1.7.1