From 6256203540690d3cf0ebf99f3cb5fa373187c8fc Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 二月 2025 17:04:30 +0800
Subject: [PATCH] 解决冲突
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomVO.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomVO.java
index d1e452b..c1d8375 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomVO.java
@@ -53,4 +53,7 @@
@JsonInclude(JsonInclude.Include.ALWAYS)
private List<ForepartAuctionSalesroomGoodsVO> elseAuctionSalesroomGoods;
+ @ApiModelProperty(value = "商品信息")
+ private List<getHomeGoodsSkuXxiVO> xiq;
+
}
--
Gitblit v1.7.1