From 8cdadf81127b9d34a54d250a3abc878a8d5339c5 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期五, 06 十二月 2024 19:31:25 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java index e5764e5..ece4111 100644 --- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java +++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java @@ -62,4 +62,19 @@ @ApiModelProperty(value = "实际支付价格") private BigDecimal paymentAmount; + @ApiModelProperty(value = "配送方式(1=自提,2=快递)") + private Integer distributionMode; + + @ApiModelProperty(value = "门店名称") + private String shopName; + + @ApiModelProperty(value = "门店地址") + private String shopAddress; + + @ApiModelProperty(value = "经度") + private String longitude; + + @ApiModelProperty(value = "纬度") + private String latitude; + } -- Gitblit v1.7.1