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

xiaoyong931011

2021-06-25 74a7354764449e8bb602e137a172c5c1593a261e

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

@@ -23,6 +23,9 @@
    @ApiModelProperty(value = "分类ID")
    private Long cateId;

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

    @ApiModelProperty(value="页码")
    private int pageNo=1;