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

guoyuji

2024-07-05 4098ea2b95d6da283ac62f2ebb30ce37fe0d6d3f

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

@@ -130,6 +130,10 @@
        limit #{offset},#{pageSize};
    </select>

    <select id="selectOrderId" >
        select * from sd.`order` where order_id=#{orderId}
    </select>

    <select id="getSelectOrderInventoryPageTotal" >
        select CEILING(count(zu.order_id)/#{pageSize}) as 'pageTotal',
        count(zu.order_id) as 'total' from