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/WdMemberAuctionSalesroomVO.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdMemberAuctionSalesroomVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdMemberAuctionSalesroomVO.java
index c4846b4..66201d5 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdMemberAuctionSalesroomVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/WdMemberAuctionSalesroomVO.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -10,33 +11,47 @@
import java.time.LocalDateTime;
@Data
public class WdMemberAuctionSalesroomVO {
+
@ApiModelProperty(value = "拍卖场id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private Long id;
+
+ @ApiModelProperty(value = "拍卖场id")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Long SalesroomId;
@ApiModelProperty(value = "拍卖场名称")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String salesroomName;
@ApiModelProperty(value = "拍卖状态 0=预展中 1=拍卖中 2=已结束")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer status;
@ApiModelProperty(value = "拍卖场说明")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String description;
@ApiModelProperty(value = "拍卖场封面图")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String coverPic;
@ApiModelProperty(value = "加入时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime BondTime;
@ApiModelProperty(value = "保证金")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal bond;
@ApiModelProperty(value = "人数")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer bondNum;
@ApiModelProperty(value = "是否参加， 1否，2 是")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isBond;
--
Gitblit v1.7.1