Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop

xiaoyong931011

2021-06-24 b8b21ccb301ebc4e0bd199ddfdae920a95245893

 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;