Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2020-06-12 c53d5fd1f68e9a681f8437d0b9fcc264dc4b65c2

 ruoyi/src/main/java/com/ruoyi/framework/web/controller/BaseController.java

@@ -67,6 +67,7 @@
    {
        TableDataInfo rspData = new TableDataInfo();
        rspData.setCode(HttpStatus.SUCCESS);
        rspData.setMsg("查询成功");
        rspData.setRows(list);
        rspData.setTotal(new PageInfo(list).getTotal());
        return rspData;