Merge remote-tracking branch 'origin/master'

feige

2025-05-06 c24698dacd5d43d99bbae35b430a189675a6532b

 ruoyi-common/src/main/java/com/ruoyi/common/utils/MapUtils.java

@@ -30,10 +30,10 @@
        return data;
    }

    public static HashMap<String,Object> getShareResult(Page pageResult, List record){
    public static HashMap<String,Object> getShareResult(Page pageResult, List record,long total){
        HashMap<String, Object> data = new HashMap<>();
        data.put("data",record);
        data.put("total",record.size());
        data.put("total",total);
        data.put("pageNo",pageResult.getCurrent());
        data.put("totalPage",pageResult.getTotal());
        data.put("pageSize",pageResult.getSize());