From 4ad0fc5f949708ee4dbd56c0db74673e8dc8040a Mon Sep 17 00:00:00 2001
From: phpcjl <phpcjl@gmail.com>
Date: 星期二, 10 十二月 2024 18:01:28 +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, 1 insertions(+), 1 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 fee0f50..056104b 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
@@ -24,7 +24,7 @@
 	@ApiModelProperty(value = "配送方式（1=自提，2=快递）", required = false)
 	private Integer distributionMode;
 	@ApiModelProperty(value = "配送地址id", required = false)
-	private Integer userAddressId;
+	private Long userAddressId;
 	@ApiModelProperty(value = "预计提货时间", required = false)
 	private String expectedDeliveryTime;
 }

--
Gitblit v1.7.1