From 6e936cc4af80fa65210d7e00a54e89a9e706305d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 16 十二月 2024 18:14:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/MyShoppingCartVo.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/MyShoppingCartVo.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/MyShoppingCartVo.java
index cc3b4b5..dbf7ed5 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/MyShoppingCartVo.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/MyShoppingCartVo.java
@@ -40,7 +40,7 @@
 	@ApiModelProperty("积分支付")
 	private Boolean pointPayment;
 	@ApiModelProperty("配送方式（1=自提，2=快递）")
-	private Integer distributionMode;
+	private String distributionMode;
 	/**
 	 * 可获得消费积分
 	 */

--
Gitblit v1.7.1