From 74c58e1877ead94a76bfa32baeb74a642988c400 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 17 十二月 2024 10:16:02 +0800
Subject: [PATCH] 合并代码
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SeckillActivityInfo.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SeckillActivityInfo.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SeckillActivityInfo.java
index 4b9d43f..d140ced 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SeckillActivityInfo.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/SeckillActivityInfo.java
@@ -8,6 +8,7 @@
import java.io.Serializable;
import java.time.LocalDateTime;
+import java.util.List;
/**
* <p>
@@ -58,5 +59,13 @@
@TableField("end_time")
private LocalDateTime endTime;
+ @ApiModelProperty(value = "是否上架：0否 1是")
+ @TableField("is_shelves")
+ private Integer isShelves;
+
+
+ @TableField(exist = false)
+ private List<GoodsSeckill> goodsSeckills;
+
}
--
Gitblit v1.7.1