From f80e1595c702e1251eaab8ec9fe112a53736df7f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 25 Jun 2021 16:47:20 +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 | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 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..a9a8717 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-否
*/
@@ -56,11 +68,11 @@
private List<String> goodsImages;
@ApiModelProperty(value="积分商品样式")
- private List<ScoreGoodsStyleDto> scoreGoodsStyleDtos;
+ 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