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

Helius

2021-07-21 2d63f8d51d3f349dd3b6e72b5ee005f3c0cf623e

 gc-user/src/main/java/com/xzx/gc/user/dto/DistribInfoListDto.java

@@ -23,6 +23,9 @@
    @ApiModelProperty(value="结束时间")
    private Date reserveTimeEnd;

    @ApiModelProperty(value = "是否禁用 0：未冻结，1：冻结")
    private String isProhibit;

    @ApiModelProperty(value="第几页",required=true)
    private int page;