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

疯狂的狮子li

2020-07-13 a3a3d62034dbc5b6a6f6808d07b47aa7f343ad38

 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;