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

guoyujie

2025-07-25 6de868b732a7d76c3a9cc735e88d93eecf7322d2

 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java

@@ -295,6 +295,10 @@
                orderMapper.saveOrderFile(OrderDetails.get(i).getFileName(), OrderDetails.get(i).getFileData(),orderId,OrderDetails.get(i).getOrderNumber());
            }

            if(OrderDetails.get(i).getShape()==null){
                OrderDetails.get(i).setShape("1");
            }

        }