From 38efbb4a62ccdd98e4122fc879dd230795ef8ce3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 19 Nov 2021 15:51:30 +0800
Subject: [PATCH] 20211119

---
 gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewGoodsVo.java |   37 ++++++++++++++++++++++++++-----------
 1 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewGoodsVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewGoodsVo.java
index d512883..69f7688 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewGoodsVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewGoodsVo.java
@@ -36,6 +36,18 @@
     @ApiModelProperty(value="商品详情",required=true)
     private String details;
 
+    @ApiModelProperty(value="原价",required=true)
+    private String originalPrice;
+
+    @ApiModelProperty(value="现价",required=true)
+    private String presentPrice;
+
+    @ApiModelProperty(value="商品分类ID",required=true)
+    private String categoryId;
+
+    @ApiModelProperty(value="商品分类名称",required=true)
+    private String categoryName;
+
     /**
      * 是否抢购 1-是 2-否
      */
@@ -43,12 +55,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/否",required=true)
     private Integer isSale;
@@ -56,16 +68,19 @@
     @ApiModelProperty(value="碳排放量",required=true)
     private Integer carbonEmissions;
 
+    @ApiModelProperty(value="限购次数")
+    private Integer quotaTime;
+
     @ApiModelProperty(value="积分商品轮播图")
     private List<String> goodsImages;
 
     @ApiModelProperty(value="积分商品样式")
-    private List<ScoreGoodsStyleVo> scoreGoodsStyleVos;
+    private List<ScoreGoodsStyleVo> scoreGoodsStyles;
 
-    @ApiModelProperty(value="创建人")
-    private String createdBy;
-
-    @ApiModelProperty(value="创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createdTime;
+//    @ApiModelProperty(value="创建人")
+//    private String createdBy;
+//
+//    @ApiModelProperty(value="创建时间")
+////    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//    private String createTime;
 }

--
Gitblit v1.9.1