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

guoyujie

2025-12-08 b9fa1c266e2d51388a757cf361680d82f6edfbea

 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">