From b8b21ccb301ebc4e0bd199ddfdae920a95245893 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 24 Jun 2021 19:23:21 +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 | 2 +-
1 files changed, 1 insertions(+), 1 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
index 4faee4b..c8f1608 100644
--- 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
@@ -72,7 +72,7 @@
private List<String> goodsImages;
@ApiModelProperty(value="积分商品样式")
- private List<ScoreGoodsStyleVo> scoreGoodsStyleVos;
+ private List<ScoreGoodsStyleVo> scoreGoodsStyles;
@ApiModelProperty(value="创建人")
private String createdBy;
--
Gitblit v1.9.1