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

chenlu

2025-12-18 aece48b253b2e0b814bbdf5ee3d474e8cf697122

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

@@ -293,7 +293,7 @@
            </if>

        </where>
        order by dd.id
        order by dd.box_no,dd.order_id,dd.order_number
    </select>

    <select id="getSelectShippingOrderDetailPageTotal">
@@ -486,6 +486,7 @@
                and od.perimeter regexp #{orderDetail.perimeter}
            </if>
        </where>
        order by od.order_id,od.order_number
    </select>

    <select id="getSelectShippingOrderDetailsPageTotal">