Merge branch 'master' of http://bore.pub:10439/r/ERP_override

chenlu

2024-07-19 670a2a2179c7c6f70316826ded2a76572eee760a

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

@@ -143,7 +143,7 @@
                                                getMinIdByGroup(orderId,
                                                    String.valueOf(detail.get("order_number")),
                                                    String.valueOf(detail.get("group")));
                    int listGlassId = Integer.parseInt(String.valueOf(detail.get("id")));
                    int listGlassId = Integer.parseInt(String.valueOf(detail.get("glassId")));
                    if(listGlassId  !=glassId){
                        detail.put("rowClass","latter");
                    }