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/HomeGoodsSkuListVO.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSkuListVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSkuListVO.java
index a2dc24c..480389f 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSkuListVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSkuListVO.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.enums.StartStatusEnum;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,37 +17,48 @@
private Long id;
@ApiModelProperty(value = "商品名称")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String skuName;
@ApiModelProperty(value = "商品年份")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String years;
@ApiModelProperty(value = "商品价格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal price;
@ApiModelProperty(value = "已售数量")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer soldQuantity;
@ApiModelProperty(value = "封面图")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String coverPic;
@ApiModelProperty(value = "是收藏 1未收藏，2收藏")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isCollection;
- @ApiModelProperty(value = "1是普通商品，2 团购商品，3 秒杀商品")
+ @ApiModelProperty(value = "1是普通商品，2 秒杀商品，3 团购商品")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer type;
@ApiModelProperty(value = "开始状态 0=未开始 1= 已开始 2=已结束")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private StartStatusEnum startStatus;
@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 xiaosPrice;
--
Gitblit v1.7.1