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/HomeGoodsSkuInfoVO.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSkuInfoVO.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSkuInfoVO.java
index 84de4f7..0d25865 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSkuInfoVO.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/HomeGoodsSkuInfoVO.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -14,66 +15,90 @@
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 String category;
@ApiModelProperty(value = "商品系列")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String series;
@ApiModelProperty(value = "商品品牌")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String brand;
@ApiModelProperty(value = "商品香型")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String flavorType;
@ApiModelProperty(value = "商品价格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private BigDecimal price;
@ApiModelProperty(value = "库存")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer stock;
@ApiModelProperty(value = "已售数量")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer soldQuantity;
@ApiModelProperty(value = "单位")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String unit;
@ApiModelProperty(value = "规格")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String spec;
@ApiModelProperty(value = "规格单位")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String specUnit;
@ApiModelProperty(value = "封面图")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String coverPic;
@ApiModelProperty(value = "详情图，不超过五张图片")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String album;
@ApiModelProperty(value = "分享标题")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String shareTitle;
@ApiModelProperty(value = "分享图片")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String sharePic;
@ApiModelProperty(value = "商品描述")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String description;
@ApiModelProperty(value = "商品说明")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private String detail;
@ApiModelProperty(value = "排序")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer sortNum;
@ApiModelProperty(value = "是收藏 1未收藏，2收藏")
+ @JsonInclude(JsonInclude.Include.ALWAYS)
private Integer isCollection;
@ApiModelProperty(value = "是团购 1没有团购，2有团购")
private Integer isGoodsGroupPurchase;
+ @ApiModelProperty(value = "是团购 1没有团购商品，2有团购商品")
+ private Integer GroupPurchaseGoods;
+
+
}
--
Gitblit v1.7.1