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/vo/XcxGoodsDetailVo.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/XcxGoodsDetailVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/XcxGoodsDetailVo.java
index 6e02c2a..22df6b0 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/XcxGoodsDetailVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/XcxGoodsDetailVo.java
@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.Date;
import java.util.List;
/**
@@ -18,7 +19,7 @@
private String name;
@ApiModelProperty(value = "列表缩略图")
- private String image;
+ private String thumb;
@ApiModelProperty(value = "现价")
private String presentPrice;
@@ -38,6 +39,21 @@
@ApiModelProperty(value = "轮播图")
private List<String> images;
+ @ApiModelProperty(value = "上下架 1-上架 2-下架")
+ private Integer isSale;
+
+ @ApiModelProperty(value = "是否抢购 1-是 2-否")
+ private Integer isQg;
+
+ @ApiModelProperty(value = "抢购开始时间")
+ private Date qgStartTime;
+
+ @ApiModelProperty(value = "抢购结束时间")
+ private Date qgEndTime;
+
+ @ApiModelProperty(value = "剩余时间")
+ private Long remainTime;
+
@ApiModelProperty(value = "样式")
private List<XcxGoodsDetailStyleVo> styles;
--
Gitblit v1.9.1