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

guoyuji

2024-07-17 fc8525d494c7fbb204a04a300865c47b789cf084

 north-glass-erp/src/main/resources/mapper/sd/CustomerMapper.xml

@@ -54,7 +54,7 @@
               od.width,
               od.height,
               o.batch,
               o.money,
               sum(od.gross_amount) as money,
               o.order_type,
               o.salesman,
               o.create_time