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

huminmin

昨天 ba957b5a448708294dead72c3c3b6f8932cc3f76

 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;