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/MemberAuctionSalesroomVO.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberAuctionSalesroomVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberAuctionSalesroomVO.java
index f32686d..358018a 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberAuctionSalesroomVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberAuctionSalesroomVO.java
@@ -1,5 +1,7 @@
package com.ruoyi.system.api.domain.vo;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.ruoyi.common.core.enums.AuthenticationEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -9,33 +11,47 @@
@Data
public class MemberAuctionSalesroomVO {
@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("是否报名 1未报名，2 已报名")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isApply;
@ApiModelProperty("报名人数")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer applyNum;
@ApiModelProperty(value = "开始时间")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime startTime;
@ApiModelProperty(value = "结束时间")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private LocalDateTime endTime;
@ApiModelProperty(value = "保证金")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal bond;
+ @ApiModelProperty(value = "实名认证 0=不需认证 1=需要实名")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private AuthenticationEnum authentication;
+
}
--
Gitblit v1.7.1