Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang...

Pu Zhibing

1 天以前 fe56b4374be4b40fab45cf08e38e3ccd491fdc98

Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/domain/dto/MgtLotteryEventPageDto.java

@@ -27,5 +27,7 @@
    @ApiModelProperty(value = "平台创建标志 0-未包含平台创建 1-包含",hidden = true)
    private Integer flag=1;

    private Integer offset;


}

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/lottery/LotteryEventServiceImpl.java

@@ -398,6 +398,7 @@
        page.setCurrent(dto.getPageNum());
        page.setPages(total/dto.getPageSize());
        //获取分页信息
        dto.setOffset((dto.getPageNum() - 1) * dto.getPageSize());
        List<MgtLotteryEventPageVo> voList = this.baseMapper.pageMgtLotteryEvent(dto);
        //填充创建对象
        voList.forEach(x->{

 ruoyi-modules/ruoyi-goods/src/main/resources/mapper/lottery/LotteryEventMapper.xml

@@ -97,7 +97,7 @@
                </otherwise>
            </choose>
        </if>
        limit #{dto.pageNum},#{dto.pageSize}
        limit #{dto.offset},#{dto.pageSize}
    </select>
    <select id="pageMgtLotteryEventCount" resultType="java.lang.Long">
        SELECT