Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

7 天以前 e3b3fd13ae3afcfbe5c03ef7249a92a093bd1831

 src/main/java/com/ruoyi/framework/web/page/TableDataInfo.java

@@ -37,7 +37,7 @@
     * @param list 列表数据

     * @param total 总记录数

     */

    public TableDataInfo(List<?> list, int total)

    public TableDataInfo(List<?> list, long total)

    {

        this.rows = list;

        this.total = total;