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

zss

8 天以前 bd1c98db3e0de80c06a53d3302781c2b0b50a3da

 src/main/resources/mapper/technology/TechnologyRoutingMapper.xml

@@ -39,6 +39,9 @@
                <if test="c.productModelId != null">
                    and tr.product_model_id = #{c.productModelId}
                </if>
                <if test="c.model != null and c.model != ''">
                    and pm.model like concat('%', #{c.model}, '%')
                </if>
                <if test="c.bomId != null">
                    and tr.bom_id = #{c.bomId}
                </if>