From 392b42c4891cf2e6beda57ab32c51598f290f4b7 Mon Sep 17 00:00:00 2001 From: mitao <2763622819@qq.com> Date: 星期五, 14 三月 2025 20:56:27 +0800 Subject: [PATCH] bug修改 --- ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberAuctionSalesroomInfoVO.java | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberAuctionSalesroomInfoVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberAuctionSalesroomInfoVO.java index fa41d15..e36eceb 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberAuctionSalesroomInfoVO.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MemberAuctionSalesroomInfoVO.java @@ -3,59 +3,76 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonInclude; import com.ruoyi.common.core.enums.AuctionStartStatusEnum; import com.ruoyi.common.core.enums.AuctionTypeEnum; import com.ruoyi.common.core.enums.AuthenticationEnum; import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; +import lombok.Data; @Data public class MemberAuctionSalesroomInfoVO { @TableId(value = "id", type = IdType.ASSIGN_ID) + @JsonInclude(JsonInclude.Include.ALWAYS) private Long id; @ApiModelProperty(value = "拍卖场名称") + @JsonInclude(JsonInclude.Include.ALWAYS) private String salesroomName; @ApiModelProperty(value = "开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonInclude(JsonInclude.Include.ALWAYS) private LocalDateTime startTime; @ApiModelProperty(value = "结束时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonInclude(JsonInclude.Include.ALWAYS) private LocalDateTime endTime; @ApiModelProperty(value = "拍卖时间 0=线下拍卖 1=线上线下结合") + @JsonInclude(JsonInclude.Include.ALWAYS) private AuctionTypeEnum type; @ApiModelProperty(value = "保证金") + @JsonInclude(JsonInclude.Include.ALWAYS) private BigDecimal bound; @ApiModelProperty(value = "实名认证 0=不需认证 1=需要实名") + @JsonInclude(JsonInclude.Include.ALWAYS) private AuthenticationEnum authentication; @ApiModelProperty(value = "拍卖场说明") + @JsonInclude(JsonInclude.Include.ALWAYS) private String description; @ApiModelProperty(value = "拍卖场封面图") + @JsonInclude(JsonInclude.Include.ALWAYS) private String coverPic; @ApiModelProperty(value = "拍卖状态 0=预展中 1=拍卖中 2=已结束") + @JsonInclude(JsonInclude.Include.ALWAYS) private AuctionStartStatusEnum status; @ApiModelProperty(value = "分享标题") + @JsonInclude(JsonInclude.Include.ALWAYS) private String shareTitle; @ApiModelProperty(value = "分享图片") + @JsonInclude(JsonInclude.Include.ALWAYS) private String sharePic; @ApiModelProperty("是否报名 1未报名,2 已报名") + @JsonInclude(JsonInclude.Include.ALWAYS) private Integer isApply; + @ApiModelProperty(value = "竞拍协议") + private String auctionAgreement; + @ApiModelProperty(value = "拍卖会的商品") + @JsonInclude(JsonInclude.Include.ALWAYS) List<ForepartAuctionSalesroomGoodsVO> forepartAuctionSalesroomGoodsVO; } -- Gitblit v1.7.1