Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

2025-07-24 5a354d67a0e62c63bef598dfcc96e3d54f50d2b2

 north-glass-erp/src/main/java/com/example/erp/service/pp/ReportService.java

@@ -188,12 +188,7 @@
            getRowCount.forEach(row -> {
                Map<String, Integer> getRow = new HashMap<>();
                // { row: 0, col: 1, rowspan: 3, colspan: 0},
                Object rowNumObj = row.get("RowNum");
                if (rowNumObj instanceof Double) {
                    getRow.put("row", ((Double) rowNumObj).intValue());
                } else if (rowNumObj instanceof Integer) {
                    getRow.put("row", (Integer) rowNumObj);
                }
                getRow.put("row",  row.get("RowNum"));
                getRow.put("col", col);
                getRow.put("rowspan", row.get("rowCount"));
                getRow.put("colspan", 0);