Merge remote-tracking branch 'origin/master'

liusheng

2 天以前 cbe903c4c4493715ad8d307107fb95975acfc975

 ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java

@@ -105,6 +105,14 @@
        rspData.put("total", total);
        return rspData;
    }
    protected Map<String, Object> getDataTable4(long total, Object object) {
        Map<String, Object> rspData = new TreeMap<>();
        rspData.put("code", HttpStatus.SUCCESS);
        rspData.put("msg", "查询成功");
        rspData.put("data", object);
        rspData.put("total", total);
        return rspData;
    }

    /**
     * 返回成功