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/ForepartAuctionSalesroomGoodsVO.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/ForepartAuctionSalesroomGoodsVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/ForepartAuctionSalesroomGoodsVO.java
index db1b9b9..33ceec7 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/ForepartAuctionSalesroomGoodsVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/ForepartAuctionSalesroomGoodsVO.java
@@ -1,6 +1,7 @@
package com.ruoyi.system.api.domain.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.enums.AuctionGoodsStatusEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -12,63 +13,83 @@
public class ForepartAuctionSalesroomGoodsVO {
@ApiModelProperty(value = "商品id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long goodsSkuId;
@ApiModelProperty(value = "拍卖场id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long SalesroomId;
@ApiModelProperty(value = "拍卖场名称")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String salesroomName;
@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=已结束")
- private AuctionGoodsStatusEnum goodsSkustatus;
+ @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 coverPic;
@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 detail;
@ApiModelProperty(value = "下一个商品名称")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String nextGoodsSkuName;
@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 String spec;
@ApiModelProperty(value = "规格单位")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String specUnit;
@ApiModelProperty(value = "商品年份")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String years;
}
--
Gitblit v1.7.1