Merge remote-tracking branch 'origin/dev_New' into dev_New

zss

23 小时以前 e595c86c223563a178b9bb0d0dcb8b0c3c3771c0

 src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml

@@ -20,8 +20,8 @@
                 left join product_model pm on ppri.product_model_id = pm.id
                 left join product p on pm.product_id = p.id
                 left join product_process pp on pp.id = ppri.process_id
        where ppri.route_id = #{orderId}
        order by ppri.id
        where ppri.product_order_id = #{orderId}
        order by ppri.drag_sort
    </select>