From d5bf846770b001cac64ca27a3fe2886a9c5076b3 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 15 一月 2025 19:47:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/SeckillActivityVO.java | 15 +++++++++++++--
1 files changed, 13 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 c98ade5..d213b55 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
@@ -12,7 +12,10 @@
public class SeckillActivityVO {
@ApiModelProperty(value = "活动id")
- private Integer id;
+ private String id;
+
+ @ApiModelProperty(value = "商品id")
+ private Integer goodsId;
@ApiModelProperty(value = "商品名称")
private String goodsName;
@@ -21,7 +24,7 @@
private String introduction;
@ApiModelProperty(value = "商品类型")
- private String goodsType;
+ private Integer goodsType;
@ApiModelProperty(value = "商品分类名称")
private String goodsCategoryName;
@@ -47,6 +50,9 @@
@ApiModelProperty(value = "基础售价")
private BigDecimal sellingPrice;
+ @ApiModelProperty(value = "基础积分")
+ private Integer integral;
+
@ApiModelProperty(value = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -62,4 +68,9 @@
@ApiModelProperty(value = "展示状态：0下架中 1上架中")
private Integer showStatus;
+
+ public Integer getType(){
+ return goodsType;
+ }
+
}
--
Gitblit v1.7.1