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

Helius

2021-08-25 7d713ee9213f4c4c88fbbea73a4e36c0b7801c92

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

@@ -28,4 +28,7 @@

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

    @ApiModelProperty(value = "是否抢购 1-是 2-否")
    private Integer isQg;
}