Merge remote-tracking branch 'origin/master'

wangfei

2025-02-27 9212801fbac08dd12b8205c217bdeb925529ab7c

 hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowGlassRelationInfoMapper.xml

@@ -59,7 +59,6 @@
                                  t.quantity,
                                  t1.child_width,
                                  t1.child_height

                           from pp.flow_card t
                                    LEFT JOIN sd.order_glass_detail t1
                                              on t.order_id = t1.order_id