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

guoyuji

2024-06-26 3bbf78db5e01bd8d080e9e4965a532326bc162ad

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

@@ -48,7 +48,8 @@
            o.quantity = od.b,
            o.area = od.c,
            o.perimeter= od.aa,
            o.other_money = ifnull(c.money,0)
            o.other_money = ifnull(c.money,0),
            o.other_remarks = (select group_concat( distinct edging_type) from order_detail where order_id = #{orderId} and  edging_type is not null)
        where
            o.order_id = #{orderId}