From 396b0760eeee4f37a21cc708955cda45ca746aa5 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 11 三月 2025 15:53:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-1.0.1' into dev-1.0.1
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomGoodsInfoVO.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomGoodsInfoVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomGoodsInfoVO.java
index 8f8aad6..06e6903 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomGoodsInfoVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomGoodsInfoVO.java
@@ -3,10 +3,10 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.List;
+import lombok.Data;
@Data
public class AuctionSalesroomGoodsInfoVO {
@@ -106,6 +106,10 @@
@JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal presentBid;
+ @ApiModelProperty(value = "最高出价")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private BigDecimal zgBid;
+
@ApiModelProperty(value = "最低加价金额")
@JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal minimumMarkupAmount;
@@ -118,6 +122,7 @@
@ApiModelProperty(value = "规格单位")
@JsonInclude(JsonInclude.Include.ALWAYS)
private String specUnit;
+
@ApiModelProperty(value = "商品说明")
@JsonInclude(JsonInclude.Include.ALWAYS)
private String detail;
@@ -134,5 +139,21 @@
@JsonInclude(JsonInclude.Include.ALWAYS)
private String explain;
+ @ApiModelProperty(value = "商品信息")
+ List<getHomeGoodsSkuXxiVO> xxiVOS;
+
+ @ApiModelProperty("是否报名 1未报名，2 已报名")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private Integer isApply;
+
+ @ApiModelProperty(value = "可中拍人数")
+ private Integer bidNum;
+
+ @ApiModelProperty(value = "最高出价金额")
+ private BigDecimal maxAmount;
+
+ @ApiModelProperty(value = "一次性每人成交数量")
+ private Integer dealQuantity;
+
}
--
Gitblit v1.7.1