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

xiaoyong931011

2021-06-25 4525d92eb8cfec5f2cd43a96862328ae6cbdf386

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

@@ -71,7 +71,7 @@
    private List<String> goodsImages;

    @ApiModelProperty(value="积分商品样式")
    private List<ScoreGoodsStyleDto> scoreGoodsStyleDtos;
    private List<ScoreGoodsStyleDto> scoreGoodsStyles;

    @ApiModelProperty(value="创建人")
    private String createdBy;