From 3e95b11cff2e6f59a7d23448f86d3d3bf806e13a Mon Sep 17 00:00:00 2001 From: phpcjl <phpcjl@gmail.com> Date: 星期五, 06 十二月 2024 18:08:27 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ShoppingCartPayment.java | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ShoppingCartPayment.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ShoppingCartPayment.java index e4e3a0a..fee0f50 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ShoppingCartPayment.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ShoppingCartPayment.java @@ -15,6 +15,8 @@ private String goodsJson; @ApiModelProperty(value = "支付方式（1=微信，2=账户余额，3=积分）", required = true) private Integer paymentType; + @ApiModelProperty(value = "运费支付方式（1=微信，2=账户余额）", required = true) + private Integer freightPaymentType; @ApiModelProperty(value = "核销门店id", required = true) private Integer shopId; @ApiModelProperty(value = "优惠券id", required = false) @@ -23,4 +25,6 @@ private Integer distributionMode; @ApiModelProperty(value = "配送地址id", required = false) private Integer userAddressId; + @ApiModelProperty(value = "预计提货时间", required = false) + private String expectedDeliveryTime; } -- Gitblit v1.7.1