From 02b38bb7c08d68fffc6af25e4ba00a456d96e94e Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 30 Jun 2021 16:22:54 +0800
Subject: [PATCH] modify

---
 gc-shop/src/main/java/com/xzx/gc/shop/dto/AddGoodsDto.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/dto/AddGoodsDto.java b/gc-shop/src/main/java/com/xzx/gc/shop/dto/AddGoodsDto.java
index 5a61c0a..b3e294c 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/dto/AddGoodsDto.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/dto/AddGoodsDto.java
@@ -32,9 +32,14 @@
     @ApiModelProperty(value="商品详情",required=true)
     private String details;
 
-    @ApiModelProperty(value="积分范围",required=true)
-    private String priceRange;
+//    @ApiModelProperty(value="积分范围",required=true)
+//    private String priceRange;
 
+    @ApiModelProperty(value="原价",required=true)
+    private String originalPrice;
+
+    @ApiModelProperty(value="现价",required=true)
+    private String presentPrice;
 
     @ApiModelProperty(value="商品分类ID",required=true)
     private String categoryId;
@@ -48,13 +53,15 @@
     @ApiModelProperty(value="是否抢购 1/是 2/否",required=true)
     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;
 
-    @ApiModelProperty(value="是否上架 1/是 2/否",required=true)
+    @ApiModelProperty(value="是否上架 1/是 2/否")
     private Integer isSale;
 
     @ApiModelProperty(value="碳排放量",required=true)
@@ -63,8 +70,8 @@
     @ApiModelProperty(value="主图")
     private List<String> goodsImages;
 
-    @ApiModelProperty(value="积分商品样式")
-    private List<ScoreGoodsStyleDto> scoreGoodsStyleDtos;
+    @ApiModelProperty(value="积分商品样式",required=true)
+    private List<ScoreGoodsStyleDto> scoreGoodsStyles;
 
     @ApiModelProperty(value="创建人")
     private String createdBy;

--
Gitblit v1.9.1