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

chenlu

2024-07-18 a7fc2a834f16d9a35a30c4da06c79781c625cdf7

 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