From 56f732ed7af0e82f32f809ff0797fd0b83b62306 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 05 十二月 2024 14:53:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/vo/SeckillActivityVO.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 bd8e336..9cfb5f0 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
@@ -6,6 +6,7 @@
import lombok.Data;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
@Data
public class SeckillActivityVO {
@@ -33,6 +34,10 @@
@ApiModelProperty(value = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private Integer startTime;
+ private LocalDateTime startTime;
+
+ @ApiModelProperty(value = "结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime endTime;
}
--
Gitblit v1.7.1