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/dto/UpdateGoodsDto.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/dto/UpdateGoodsDto.java b/gc-shop/src/main/java/com/xzx/gc/shop/dto/UpdateGoodsDto.java
index 7b7fe17..7ee3354 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/dto/UpdateGoodsDto.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/dto/UpdateGoodsDto.java
@@ -32,6 +32,18 @@
@ApiModelProperty(value="商品详情",required=true)
private String details;
+ @ApiModelProperty(value="原价",required=true)
+ private String originalPrice;
+
+ @ApiModelProperty(value="现价",required=true)
+ private String presentPrice;
+
+ @ApiModelProperty(value="商品分类ID",required=true)
+ private String categoryId;
+
+ @ApiModelProperty(value="商品分类名称",required=true)
+ private String categoryName;
+
/**
* 是否抢购 1-是 2-否
*/
@@ -52,15 +64,18 @@
@ApiModelProperty(value="碳排放量",required=true)
private Integer carbonEmissions;
+ @ApiModelProperty(value="限购次数")
+ private Integer quotaTime;
+
@ApiModelProperty(value="积分商品轮播图")
private List<String> goodsImages;
- @ApiModelProperty(value="积分商品样式")
- private List<ScoreGoodsStyleDto> scoreGoodsStyleDtos;
+ @ApiModelProperty(value="积分商品样式",required=true)
+ private List<ScoreGoodsStyleDto> scoreGoodsStyles;
- @ApiModelProperty(value="创建人")
- private String createdBy;
-
- @ApiModelProperty(value="创建时间")
- private Date createdTime;
+// @ApiModelProperty(value="创建人")
+// private String createdBy;
+//
+// @ApiModelProperty(value="创建时间")
+// private Date createdTime;
}
--
Gitblit v1.9.1