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

liyong

9 天以前 41b6d0c9c00b24534a90bbd4cdeb0537cb889c67

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

@@ -20,7 +20,7 @@
                 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}
        where ppri.product_order_id = #{orderId}
        order by ppri.drag_sort
    </select>