Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventor...

huminmin

2 天以前 49133ae6eafda4d6bd86ed9a9241177a12a47348

 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;