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

xiaoyong931011

2021-07-21 d25897a9e4a96079e3ef9d767083e631ead13a1c

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

@@ -10,7 +10,7 @@

    @ApiModelProperty(value="名称",required=true)
    private String name;
    @ApiModelProperty(value="是否已删除 1:是 2：否",required=true)
    @ApiModelProperty(value="是否已删除 0：未删除 1:已删除 2全部")
    private Integer delFlag;
    @ApiModelProperty(value="第几页",required=true)
    private int page;