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

xiaoyong931011

2021-07-23 7870947c3dc93f6d8b2db718eab551edfc709f9b

 gc-shop/src/main/java/com/xzx/gc/shop/dto/ScoreGoodsStyleDto.java

@@ -17,6 +17,6 @@
    private Long goodsId;

    @ApiModelProperty(value="积分商品规格")
    private List<ScoreGoodsSkuDto> scoreGoodsSkuDtos;
    private List<ScoreGoodsSkuDto> scoreGoodsSkus;

}