Merge remote-tracking branch 'origin/master'

puzhibing

2025-01-13 0961a8595a8b8a3db70b7dd0608d630637458bee

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

@@ -63,7 +63,7 @@
    private BigDecimal paymentAmount;

    @ApiModelProperty(value = "配送方式（1=自提，2=快递）")
    private Integer distributionMode;
    private String distributionMode;

    @ApiModelProperty(value = "门店名称")
    private String shopName;
@@ -84,6 +84,6 @@
    private String technicianName;

    @ApiModelProperty(value = "预约单id")
    private Long technicianSubscribeId;
    private String technicianSubscribeId;

}