From 2526190b209e74f3f882eaf19cc95d333589d7b8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 14 一月 2026 10:04:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/ShopCarVO.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ShopCarVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ShopCarVO.java
index b3e3aa4..36ad05a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ShopCarVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ShopCarVO.java
@@ -6,6 +6,7 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.util.List;
@Data
@ApiModel("购物车返回VO")
@@ -14,5 +15,5 @@
private BigDecimal totalPrice;
@ApiModelProperty("购物车")
- private PageInfo<TErpGoodsVO> list;
+ private List<TErpGoodsVO> list;
}
--
Gitblit v1.7.1