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

guoyuji

2024-07-03 b74d3f3e8cfece410031916d18b9ebccb0aba731

 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}

@@ -193,7 +194,8 @@
    <update id="reviewOrderById">
        update `order` set order_review = #{status},
                           verifier_id = #{userId},
                           verifier = #{userName}
                           verifier = #{userName},
                           update_time=now()
                           where order_id = #{id}
    </update>
    <update id="reviewOrderByIds">