From efa01b099eaaa263a3745cc11445d41c64c95306 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 29 Jun 2021 17:08:33 +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 |    6 +++---
 1 files changed, 3 insertions(+), 3 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 2b48c4f..b3e294c 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
@@ -61,7 +61,7 @@
     @ApiModelProperty(value="抢购结束时间")
     private Date qgEndTime;
 
-    @ApiModelProperty(value="是否上架 1/是 2/否",required=true)
+    @ApiModelProperty(value="是否上架 1/是 2/否")
     private Integer isSale;
 
     @ApiModelProperty(value="碳排放量",required=true)
@@ -70,8 +70,8 @@
     @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;

--
Gitblit v1.9.1