Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-09 a88a536514b0ee5fb863dd5c992279d5b86ad77f

 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;

}