From c963605163f4fbf91565fa5e319a17fe2545fdb4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 06 十二月 2024 19:32:09 +0800
Subject: [PATCH] 合并代码

---
 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