Merge remote-tracking branch 'origin/master'

xuhy

2025-01-16 9fde9f917552f659d41fcfce5094f429a29b8ead

 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;

}