Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

9 天以前 0e3b66ffaf4d601a2c5560bdd61a0121bea7696c

 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;