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/AuctionGoodsListVO.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsListVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsListVO.java
index 0787e5d..02ad0b2 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsListVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/AuctionGoodsListVO.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.AuctionStartStatusEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -33,28 +34,38 @@
private AuctionStartStatusEnum startStatus;
@ApiModelProperty(value = "单位")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String unit;
@ApiModelProperty(value = "封面图")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String coverPic;
@ApiModelProperty(value = "规格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String spec;
@ApiModelProperty(value = "规格单位")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String specUnit;
@ApiModelProperty(value = "是中标 1未中标，2中标")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isStatus;
@ApiModelProperty(value = "商品年份")
private String years;
@ApiModelProperty(value = "商品描述")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String description;
@ApiModelProperty(value = "商品说明")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String detail;
+ @ApiModelProperty(value = "是收藏 1未收藏，2收藏")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
+ private Integer isCollection;
}
--
Gitblit v1.7.1