From c094aa1a63e711a632f24a17f21462778829ecc7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 10 Nov 2021 15:08:01 +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/AddGoodsDto.java | 20 +++++++++++++++-----
1 files changed, 15 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..3af606d 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,23 +53,28 @@
@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)
private Integer carbonEmissions;
+ @ApiModelProperty(value="限购次数")
+ private Integer quotaTime;
+
@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