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

maven

9 小时以前 34e986e6e158450ee35319f1cac872a4bc974a74

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

@@ -13,8 +13,9 @@
    </resultMap>

    <select id="pageProcessRouteDto" resultType="com.ruoyi.production.dto.ProcessRouteDto">
        select ps.*, p.product_name,pm.product_id,pm.model
        select ps.*, p.product_name,pm.product_id,pm.model,pb.bom_no
        from process_route ps
        left join product_bom pb on ps.bom_id = pb.id
        left join product_model pm on ps.product_model_id = pm.id
        left join product p on pm.product_id = p.id
        <where>