From b8b21ccb301ebc4e0bd199ddfdae920a95245893 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 24 Jun 2021 19:23:21 +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 | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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..2b48c4f 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,9 +53,11 @@
@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;
--
Gitblit v1.9.1