From e497a05ce312d26864b0c23cad97da9eb32c2cc1 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 10 Nov 2021 16:01:34 +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/ViewGoodsVo.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewGoodsVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewGoodsVo.java
index 4faee4b..69f7688 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewGoodsVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewGoodsVo.java
@@ -55,12 +55,12 @@
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/否",required=true)
private Integer isSale;
@@ -68,16 +68,19 @@
@ApiModelProperty(value="碳排放量",required=true)
private Integer carbonEmissions;
+ @ApiModelProperty(value="限购次数")
+ private Integer quotaTime;
+
@ApiModelProperty(value="积分商品轮播图")
private List<String> goodsImages;
@ApiModelProperty(value="积分商品样式")
- private List<ScoreGoodsStyleVo> scoreGoodsStyleVos;
+ private List<ScoreGoodsStyleVo> scoreGoodsStyles;
- @ApiModelProperty(value="创建人")
- private String createdBy;
-
- @ApiModelProperty(value="创建时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date createdTime;
+// @ApiModelProperty(value="创建人")
+// private String createdBy;
+//
+// @ApiModelProperty(value="创建时间")
+//// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+// private String createTime;
}
--
Gitblit v1.9.1