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

huang

2024-12-26 9692c944974f5f7f34371910c1049c640db19e63

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

@@ -121,6 +121,9 @@
        if (object.get("userName") != null) {
            userName = object.get("userName").toString();
        }
        if ("null".equals(projectNmae)) {
            projectNmae = "";
        }
        Double sumArea = (double) 0;
        Double area = (double) 0;
        Integer sumQuantity = 0;