Merge remote-tracking branch 'origin/master'

于杰

2025-08-29 6b6f3fbd333894209e0df1822ff89881aa4319fe

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

@@ -83,7 +83,7 @@
                                new QueryWrapper<GlassPriceBasic>()
                                        .eq("name", name+s));
                        if(glassPriceBasic == null) {
                            return 0.0;
                            money[0] += 0.0;
                        }else{
                            money[0] += glassPriceBasic.getPrice();
                        }