From f28142767f8823667499e6e94a76789f601f1654 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 16 十二月 2024 13:34:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/SeckillActivityVO.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/SeckillActivityVO.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/SeckillActivityVO.java
index 9cfb5f0..c98ade5 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/SeckillActivityVO.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/SeckillActivityVO.java
@@ -20,6 +20,24 @@
@ApiModelProperty(value = "商品简介")
private String introduction;
+ @ApiModelProperty(value = "商品类型")
+ private String goodsType;
+
+ @ApiModelProperty(value = "商品分类名称")
+ private String goodsCategoryName;
+
+ @ApiModelProperty(value = "运营成本")
+ private BigDecimal operatingCost;
+
+ @ApiModelProperty(value = "门店成本")
+ private BigDecimal shopCost;
+
+ @ApiModelProperty(value = "限购数量")
+ private Integer maxNum;
+
+ @ApiModelProperty(value = "销量")
+ private Integer saleNum;
+
@ApiModelProperty(value = "封面图")
private String homePagePicture;
@@ -29,8 +47,6 @@
@ApiModelProperty(value = "基础售价")
private BigDecimal sellingPrice;
- @ApiModelProperty(value = "已售数量")
- private Integer saleNum;
@ApiModelProperty(value = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -40,4 +56,10 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime endTime;
+ @ApiModelProperty(value = "状态：1未开始 2已开始 3已结束")
+ private Integer status;
+
+ @ApiModelProperty(value = "展示状态：0下架中 1上架中")
+ private Integer showStatus;
+
}
--
Gitblit v1.7.1