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

Helius

2021-06-25 1da9a96fd9f1031d81d5d829a2df18fd4ac5abd1

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

@@ -70,9 +70,9 @@
    @ApiModelProperty(value="积分商品样式")
    private List<ScoreGoodsStyleDto> scoreGoodsStyles;

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

    @ApiModelProperty(value="创建时间")
    private Date createdTime;
//    @ApiModelProperty(value="创建人")
//    private String createdBy;
//
//    @ApiModelProperty(value="创建时间")
//    private Date createdTime;
}