Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

廖井涛

2024-05-11 91f291a2c3b4e41fc0b44f2395ad5c956803ee8c

 north-glass-erp/target/classes/mapper/sd/OrderMapper.xml

@@ -37,7 +37,8 @@
            o.money = ifnull(od.detailAmount,0)+ifnull(c.money,0),
            o.quantity = od.b,
            o.area = od.c,
            o.perimeter= od.aa
            o.perimeter= od.aa,
            o.other_money = ifnull(c.money,0)
        where
            o.order_id = #{orderId}