From 6b2f834925f0f9c94a99070d33cb0baa8b4e2bc9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Jun 2021 10:12:52 +0800
Subject: [PATCH] modify

---
 gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryGoodsListVo.java |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryGoodsListVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryGoodsListVo.java
index 8642998..b495177 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryGoodsListVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryGoodsListVo.java
@@ -33,6 +33,12 @@
     @ApiModelProperty(value="商品详情")
     private String details;
 
+    @ApiModelProperty(value="原价",required=true)
+    private String originalPrice;
+
+    @ApiModelProperty(value="现价",required=true)
+    private String presentPrice;
+
     /**
      * 是否抢购 1-是 2-否
      */
@@ -40,12 +46,12 @@
     private Integer isQg;
 
     @ApiModelProperty(value="抢购开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date qgStartTime;
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private String qgStartTime;
 
     @ApiModelProperty(value="抢购结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date qgEndTime;
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private String qgEndTime;
 
     @ApiModelProperty(value="是否上架 1/是 2/否")
     private Integer isSale;
@@ -60,6 +66,6 @@
     private short delFlag;
 
     @ApiModelProperty(value="创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createdTime;
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private String createTime;
 }

--
Gitblit v1.9.1