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

guoyuji

2024-07-05 4098ea2b95d6da283ac62f2ebb30ce37fe0d6d3f

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

@@ -13,10 +13,15 @@
            a.create_time,
            b.alias,
            b.id
        from order_other_money as a
        left join  basic_other_money as b
        on a.`column` = b.`column`
        where a.order_id = #{orderId}
        from basic_other_money as b
        left join  order_other_money as a
        on a.`column` = b.`column` and a.order_id = #{orderId}
        where b.`column` like 'M%' and b.state=1
    </select>

    <select id="selectGrossAmount">
        select ifnull(sum(money),0) from order_other_money where order_id = #{orderId}

    </select>