From c13cc7349ca2a5ffa8eb1d41c583ceef2647abdb Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 24 Jun 2021 14:57:35 +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/AddGoodsDto.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/dto/AddGoodsDto.java b/gc-shop/src/main/java/com/xzx/gc/shop/dto/AddGoodsDto.java
index 244b68e..5a61c0a 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/dto/AddGoodsDto.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/dto/AddGoodsDto.java
@@ -32,6 +32,16 @@
     @ApiModelProperty(value="商品详情",required=true)
     private String details;
 
+    @ApiModelProperty(value="积分范围",required=true)
+    private String priceRange;
+
+
+    @ApiModelProperty(value="商品分类ID",required=true)
+    private String categoryId;
+
+    @ApiModelProperty(value="商品分类名称",required=true)
+    private String categoryName;
+
     /**
      * 是否抢购 1-是 2-否
      */
@@ -50,7 +60,7 @@
     @ApiModelProperty(value="碳排放量",required=true)
     private Integer carbonEmissions;
 
-    @ApiModelProperty(value="积分商品轮播图")
+    @ApiModelProperty(value="主图")
     private List<String> goodsImages;
 
     @ApiModelProperty(value="积分商品样式")

--
Gitblit v1.9.1