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-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/vo/MgtAuctionSalesroomGoodsVO.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/vo/MgtAuctionSalesroomGoodsVO.java b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/vo/MgtAuctionSalesroomGoodsVO.java
index f90c082..1d0a340 100644
--- a/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/vo/MgtAuctionSalesroomGoodsVO.java
+++ b/ruoyi-modules/ruoyi-auction/src/main/java/com/ruoyi/auction/controller/management/vo/MgtAuctionSalesroomGoodsVO.java
@@ -1,11 +1,14 @@
package com.ruoyi.auction.controller.management.vo;
-import com.ruoyi.common.core.enums.AuctionStartStatusEnum;
+import com.ruoyi.common.core.enums.AuctionGoodsStatusEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
import lombok.Data;
+import lombok.NoArgsConstructor;
/**
* @author mitao
@@ -13,6 +16,9 @@
*/
@Data
@ApiModel(value = "拍卖场商品视图对象", description = "拍卖场商品视图对象")
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
public class MgtAuctionSalesroomGoodsVO implements Serializable {
private static final long serialVersionUID = 2894806543298759929L;
@@ -22,7 +28,7 @@
@ApiModelProperty(value = "商品id")
private Long goodsSkuId;
-
+
@ApiModelProperty("拍卖商品名")
private String goodsSkuName;
@@ -41,7 +47,25 @@
@ApiModelProperty(value = "设为备选")
private Boolean backupStatus;
- @ApiModelProperty(value = "状态 0=预展中 1=拍卖中 2=已结束")
- private AuctionStartStatusEnum status;
+ @ApiModelProperty(value = "状态 0=等待中 1=进行中 2=已结束")
+ private AuctionGoodsStatusEnum status;
+
+ @ApiModelProperty(value = "规格")
+ private String spec;
+
+ @ApiModelProperty(value = "中拍人数")
+ private Integer bidCount = 0;
+
+ @ApiModelProperty(value = "已拍数量")
+ private Integer bidQuantity = 0;
+
+ @ApiModelProperty(value = "已拍人数")
+ private Integer bidPersonCount = 0;
+
+ @ApiModelProperty(value = "起拍价格")
+ private BigDecimal startingPrice;
+
+ @ApiModelProperty(value = "排序")
+ private Integer sortNum;
}
--
Gitblit v1.7.1