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

chenlu

107 分钟以前 3247273b3505b42c400251ee2fc0921affaadf40

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

@@ -6,17 +6,17 @@
    <select id="findById">
        select
            a.order_id,
            a.`column`,
            b.`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`
        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">