From 7a69fd5e4db1f01b95385e5757ccf73359d2fa3d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 29 Jun 2021 17:19:54 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-shop/src/main/java/com/xzx/gc/shop/dto/SnapUpGoodsDto.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/dto/SnapUpGoodsDto.java b/gc-shop/src/main/java/com/xzx/gc/shop/dto/SnapUpGoodsDto.java
index 80ae4fb..a36c232 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/dto/SnapUpGoodsDto.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/dto/SnapUpGoodsDto.java
@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -14,9 +15,10 @@
@ApiModelProperty(value="是否抢购 1/是 2/否")
private Integer isQg;
+ @JsonFormat(shape=JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty(value="抢购开始时间")
private Date qgStartTime;
-
+ @JsonFormat(shape=JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
@ApiModelProperty(value="抢购结束时间")
private Date qgEndTime;
}
--
Gitblit v1.9.1