From c4bade94a970fca41493ec5a8e02a91219248a57 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 01 Dec 2021 10:47:47 +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/vo/QueryGoodsListVo.java | 15 +++++++++------
1 files changed, 9 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 5696fa7..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
@@ -46,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;
@@ -66,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