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

chenlu

2024-09-03 f25c0e53a507f9e435429242e9b1c974aaae29bc

 north-glass-erp/src/main/resources/mapper/pp/WordOrder.xml

@@ -95,7 +95,7 @@
        left join `order` as o
        on o.order_id=ogd.order_id
        where ogd.production_id IS NOT NULL

        and o.order_review>0
        <if test="orderGlassDetail.orderId != null and orderGlassDetail.orderId != ''">
            and o.order_id regexp #{orderGlassDetail.orderId}
        </if>