Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

廖井涛

2024-04-25 ed6f35069824d71ee6da599a328d865eb0c58550

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

@@ -5,8 +5,14 @@
<mapper namespace="com.example.erp.mapper.sd.OrderOtherMoneyMapper">
    <select id="findById">
        select
            a.*,
            b.alias
            a.order_id,
            a.`column`,
            a.quantity,
            a.price,
            a.money,
            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`