From 98933984fa1353d298a5117fb2a2d044fc51af93 Mon Sep 17 00:00:00 2001
From: rentaiming <806181662@qq.com>
Date: 星期六, 22 六月 2024 13:18:36 +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 | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 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 115098d..5a30417 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
@@ -86,6 +86,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 +105,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)
@@ -114,9 +126,17 @@
@JsonInclude(JsonInclude.Include.ALWAYS)
private String detail;
+ @ApiModelProperty(value = "订单id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private Long orderId;
+ @ApiModelProperty(value = "订单编号")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private String orderNo;
-
+ @ApiModelProperty(value = "商品说明")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private String explain;
}
--
Gitblit v1.7.1