Merge remote-tracking branch 'origin/master'

puzhibing

2025-01-14 c736ea2df1516ba9f0674aac019fb1ab51038d5c

 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 Long technicianSubscribeId;
    private String technicianSubscribeId;

    @ApiModelProperty("核销码BASE64")
    private String writeOffCode;

}