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

廖井涛

7 天以前 1e6c537c6ae83a30fa3732939d16422ff2d105dd

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

@@ -1328,7 +1328,7 @@
        }

        totalSumMap.put("stockNum", totalStockNum);
        totalSumMap.put("stockArea", totalStockArea);
        totalSumMap.put("stockArea", Double.valueOf(String.format("%.2f", totalStockArea)));

        map.put("data", resultList);
        map.put("total", totalSumMap);