From c094aa1a63e711a632f24a17f21462778829ecc7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 10 Nov 2021 15:08:01 +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 | 5 ++++-
1 files changed, 4 insertions(+), 1 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 b939f1b..ea8fce1 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
@@ -15,7 +15,7 @@
private String name;
@ApiModelProperty(value = "图片")
- private String image;
+ private String thumb;
@ApiModelProperty(value = "现价")
private String presentPrice;
@@ -28,4 +28,7 @@
@ApiModelProperty(value = "库存")
private Integer stock;
+
+ @ApiModelProperty(value = "是否抢购 1-是 2-否")
+ private Integer isQg;
}
--
Gitblit v1.9.1