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

xiaoyong931011

2021-06-29 efa01b099eaaa263a3745cc11445d41c64c95306

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

@@ -32,6 +32,9 @@
    @ApiModelProperty(value="每页显示记录数")
    private int pageSize=10;

    @ApiModelProperty(hidden = true)
    private String userId;

    @ApiModelProperty(value = "排序 1-综合 2-销量 3-价格")
    private int sort = 1;