Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

liyong

2 天以前 a92b12d5adaa8827c1474d42b73c98e17953ecb5

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

@@ -23,6 +23,9 @@
                left join product p on pm.product_id = p.id
                left join product_process pp on ps.process_id = pp.id
        where ps.bom_id = #{bomId}
        <if test="isParent">
            and ps.parent_id is not null
        </if>
        order by ps.id
    </select>
    <select id="listBybomAndProcess" resultType="com.ruoyi.production.dto.ProductStructureDto">