From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionSalesroomGoodsInfoVO.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 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 84b2cb7..5d33b5b 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
@@ -7,6 +7,7 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.List;
@Data
public class AuctionSalesroomGoodsInfoVO {
@@ -86,6 +87,14 @@
@JsonInclude(JsonInclude.Include.ALWAYS)
private String album;
+ @ApiModelProperty(value = "分享标题")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private String shareTitle;
+
+ @ApiModelProperty(value = "分享图片")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private String sharePic;
+
@ApiModelProperty(value = "是否出价 1未出价，2出价")
@JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isBond;
@@ -97,6 +106,10 @@
@ApiModelProperty(value = "当前出价")
@JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal presentBid;
+
+ @ApiModelProperty(value = "最高出价")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private BigDecimal zgBid;
@ApiModelProperty(value = "最低加价金额")
@JsonInclude(JsonInclude.Include.ALWAYS)
@@ -110,6 +123,7 @@
@ApiModelProperty(value = "规格单位")
@JsonInclude(JsonInclude.Include.ALWAYS)
private String specUnit;
+
@ApiModelProperty(value = "商品说明")
@JsonInclude(JsonInclude.Include.ALWAYS)
private String detail;
@@ -122,7 +136,16 @@
@JsonInclude(JsonInclude.Include.ALWAYS)
private String orderNo;
+ @ApiModelProperty(value = "商品说明")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private String explain;
+ @ApiModelProperty(value = "商品信息")
+ List<getHomeGoodsSkuXxiVO> xxiVOS;
+
+ @ApiModelProperty("是否报名 1未报名，2 已报名")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private Integer isApply;
}
--
Gitblit v1.7.1