From 82de609c0b76d37d1a5044a631ddc1577374cdfa Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 15 七月 2024 11:36:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java
index 4b3e1f7..75a14d1 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsinfoVO.java
@@ -10,6 +10,8 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.List;
+
@Data
public class AuctionGoodsinfoVO {
@@ -47,17 +49,27 @@
@JsonInclude(JsonInclude.Include.ALWAYS)
private String unit;
+ @ApiModelProperty(value = "最高出价")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private BigDecimal zgBid;
+
+
@ApiModelProperty(value = "商品描述")
@JsonInclude(JsonInclude.Include.ALWAYS)
private String description;
@ApiModelProperty(value = "商品说明")
@JsonInclude(JsonInclude.Include.ALWAYS)
+ private String explain;
+
+ @ApiModelProperty(value = "商品介绍")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String detail;
@ApiModelProperty(value = "商品年份")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@JsonInclude(JsonInclude.Include.ALWAYS)
- private String years;
+ private LocalDateTime years;
@ApiModelProperty(value = "商品分类")
@JsonInclude(JsonInclude.Include.ALWAYS)
@@ -97,7 +109,7 @@
@ApiModelProperty(value = "实名认证 0=不需实名 1=需要实名")
@JsonInclude(JsonInclude.Include.ALWAYS)
- private AuthenticationEnum authentication;
+ private Integer authentication;
@ApiModelProperty("是否报名 1未报名，2 已报名")
@JsonInclude(JsonInclude.Include.ALWAYS)
@@ -128,4 +140,19 @@
@ApiModelProperty(value = "分享图片")
@JsonInclude(JsonInclude.Include.ALWAYS)
private String sharePic;
+
+ @ApiModelProperty(value = "订单id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private Long orderId;
+
+ @ApiModelProperty(value = "订单编号")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private String orderNo;
+
+ @ApiModelProperty(value = "保证金")
+ private BigDecimal bond;
+
+ @ApiModelProperty(value = "商品信息")
+ List<getHomeGoodsSkuXxiVO> xxiVOS;
+
}
--
Gitblit v1.7.1