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/XcxGoodsListVo.java |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/XcxGoodsListVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/XcxGoodsListVo.java
index ea8fce1..77f48c9 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/XcxGoodsListVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/XcxGoodsListVo.java
@@ -1,8 +1,11 @@
 package com.xzx.gc.shop.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.util.Date;
 
 @Data
 @ApiModel(value = "XcxGoodsListVo", description = "小程序商品列表返回参数类")
@@ -29,6 +32,18 @@
     @ApiModelProperty(value = "库存")
     private Integer stock;
 
+    @ApiModelProperty(value = "限购数量")
+    private Integer quotaTime;
+
+    @ApiModelProperty(value = "剩余限购数量")
+    private Integer avaQuotaTime;
+
+    @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 Date qgEndTime;
+
     @ApiModelProperty(value = "是否抢购 1-是 2-否")
     private Integer isQg;
 }

--
Gitblit v1.9.1