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

xiaoyong931011

2021-07-23 774cb0ede0572062f025132a5c2a0262188abf05

 gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryGoodsListVo.java

@@ -59,6 +59,9 @@
    @ApiModelProperty(value="碳排放量")
    private Integer carbonEmissions;

    @ApiModelProperty(value="商品总库存")
    private Integer stock;

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