Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng

无关风月

2025-01-14 4db8023227b3900740b8be361c436ddadb1d0585

 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;

}