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

guoyuji

2024-12-03 68d7be0814e89ef811c2e7c435dff7af64ea60c1

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

@@ -10,7 +10,7 @@
        from
            sd.`order` as o
        where
            o.quantity=#{order.quantity} and o.area=#{order.area} and o.project=#{order.project} and o.customer_id=#{order.customerId}
            o.quantity=#{order.quantity} and o.area=#{order.area} and trim(o.project)=trim(#{order.project}) and o.customer_id=#{order.customerId}
    </select>

    <select id="selectMaxOrderId">