From ec759e2c4e9340a1f447dec93ce4742c1c8c132a Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 17 一月 2025 15:49:14 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/SeckillActivityVO.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 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 5ff9b25..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
@@ -50,6 +50,9 @@
@ApiModelProperty(value = "基础售价")
private BigDecimal sellingPrice;
+ @ApiModelProperty(value = "基础积分")
+ private Integer integral;
+
@ApiModelProperty(value = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -65,4 +68,9 @@
@ApiModelProperty(value = "展示状态：0下架中 1上架中")
private Integer showStatus;
+
+ public Integer getType(){
+ return goodsType;
+ }
+
}
--
Gitblit v1.7.1