From 1e4882c018f13c2b686f2544316672ee66eeced6 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 05 十二月 2024 17:49:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/ShoppingCartPayment.java |    2 ++
 1 files changed, 2 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 6a9342e..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)

--
Gitblit v1.7.1