From 0155e75a9b1189a7ba805faad55a359b2b8cd259 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 24 Jun 2021 10:37:59 +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 |   71 +++++++++++++++++++++++++++++++++++
 1 files changed, 71 insertions(+), 0 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
new file mode 100644
index 0000000..d512883
--- /dev/null
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/ViewGoodsVo.java
@@ -0,0 +1,71 @@
+package com.xzx.gc.shop.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xzx.gc.entity.ScoreGoodsStyle;
+import com.xzx.gc.shop.dto.ScoreGoodsStyleDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@ApiModel(value = "ViewGoodsVo", description = "商品")
+public class ViewGoodsVo {
+
+    private long id;
+    @ApiModelProperty(value="商品编号",required=true)
+    private String goodsNo;
+
+    @ApiModelProperty(value="商品名称",required=true)
+    private String name;
+
+    @ApiModelProperty(value="单位",required=true)
+    private String unit;
+
+    @ApiModelProperty(value="品牌",required=true)
+    private String brand;
+
+    @ApiModelProperty(value="配送方式",required=true)
+    private String shipping;
+
+    @ApiModelProperty(value="缩略图",required=true)
+    private String thumb;
+
+    @ApiModelProperty(value="商品详情",required=true)
+    private String details;
+
+    /**
+     * 是否抢购 1-是 2-否
+     */
+    @ApiModelProperty(value="是否抢购 1/是 2/否",required=true)
+    private Integer isQg;
+
+    @ApiModelProperty(value="抢购开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date qgStartTime;
+
+    @ApiModelProperty(value="抢购结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date qgEndTime;
+
+    @ApiModelProperty(value="是否上架 1/是 2/否",required=true)
+    private Integer isSale;
+
+    @ApiModelProperty(value="碳排放量",required=true)
+    private Integer carbonEmissions;
+
+    @ApiModelProperty(value="积分商品轮播图")
+    private List<String> goodsImages;
+
+    @ApiModelProperty(value="积分商品样式")
+    private List<ScoreGoodsStyleVo> scoreGoodsStyleVos;
+
+    @ApiModelProperty(value="创建人")
+    private String createdBy;
+
+    @ApiModelProperty(value="创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createdTime;
+}

--
Gitblit v1.9.1