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 |   55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 55 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 2692e09..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
@@ -1,11 +1,13 @@
 package com.ruoyi.system.api.domain.vo;
 
 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;
 
 @Data
 public class AuctionSalesroomGoodsInfoVO {
@@ -13,84 +15,137 @@
     private Long SalesroomId;
 
     @ApiModelProperty(value = "拍卖场名称")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private String salesroomName;
 
     @ApiModelProperty(value = "商品id")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private Long goodsSkuId;
 
     @ApiModelProperty(value = "商品名称")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private String goodsSkuName;
 
     @ApiModelProperty(value = "起拍价格")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private BigDecimal startingPrice;
 
     @ApiModelProperty(value = "拍品数量")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private Integer salesroomStock;
 
     @ApiModelProperty(value = "拍卖时间 0=线下拍卖 1=线上线下结合")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private Integer SalesroomType;
 
     @ApiModelProperty(value = "状态 0=预展中 1=拍卖中 2=已结束")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private Integer goodsSkustatus;
 
     @ApiModelProperty(value = "拍卖时间（分钟）")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private Integer listingDuration;
 
     @ApiModelProperty(value = "开始时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private LocalDateTime startTime;
 
     @ApiModelProperty(value = "单位")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private String unit;
 
     @ApiModelProperty(value = "商品描述")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private String description;
 
     @ApiModelProperty(value = "商品年份")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private String years;
 
     @ApiModelProperty(value = "商品分类")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private String category;
 
     @ApiModelProperty(value = "商品系列")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private String series;
 
     @ApiModelProperty(value = "商品品牌")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private String brand;
 
     @ApiModelProperty(value = "商品香型")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private String flavorType;
 
     @ApiModelProperty(value = "封面图")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private String coverPic;
 
     @ApiModelProperty(value = "详情图，不超过五张图片")
+    @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;
 
     @ApiModelProperty(value = "是中标 1未中标，2中标")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private Integer isStatus;
 
     @ApiModelProperty(value = "当前出价")
+    @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;
 
 
     @ApiModelProperty(value = "规格")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private String spec;
 
     @ApiModelProperty(value = "规格单位")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
     private String specUnit;
+
     @ApiModelProperty(value = "商品说明")
+    @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;
 
+    @ApiModelProperty(value = "商品信息")
+    List<getHomeGoodsSkuXxiVO> xxiVOS;
+
+    @ApiModelProperty("是否报名 1未报名，2 已报名")
+    @JsonInclude(JsonInclude.Include.ALWAYS)
+    private Integer isApply;
 
 
 }

--
Gitblit v1.7.1