Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-10 fcabbb78c0158b4417f89475935f0f36f58f0d87

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java

@@ -80,4 +80,7 @@
    @ApiModelProperty(value = "门店id")
    private Integer shopId;

    @ApiModelProperty(value = "技师名称")
    private String technicianName;

}