From 12542f379312598f83a50893584944e51fc0f2b9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sat, 09 Oct 2021 16:06:43 +0800
Subject: [PATCH] fix
---
gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryGoodsListVo.java | 21 +++++++++++++++------
1 files changed, 15 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..6402bd9 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,18 +46,21 @@
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;
@ApiModelProperty(value="碳排放量")
private Integer carbonEmissions;
+
+ @ApiModelProperty(value="商品总库存")
+ private Integer stock;
@ApiModelProperty(value="创建人")
private String createdBy;
@@ -60,6 +69,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