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

yaowanxin

3 天以前 ac135b66a5ab9f2f74c55961066974e815b88e9a

 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;