Merge remote-tracking branch 'origin/master'

于杰

2025-07-28 6fac4cbed12a84473e8eab217abacc221dedca9f

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

@@ -222,6 +222,7 @@
                Map<String, String> data = JSON.parseObject(dataList.get(i).get("reportWorkQuantity"),
                        new TypeReference<Map<String, String>>() {
                        });

                for (String key : clos.keySet()) {
                    if(data.get(key) != null){
                       Integer max = orderGlassDetailMapper