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

zss

8 天以前 c483ee040589c0063724059228e7e6c8e4ff943c

 src/main/resources/mapper/quality/QualityUnqualifiedMapper.xml

@@ -84,9 +84,16 @@
                ELSE false
                END AS method
        FROM quality_unqualified qu
                 LEFT JOIN product_model pm ON qu.model = pm.id
                 LEFT JOIN product_model pm ON qu.product_model_id = pm.id
        where
            1=1
        and qu.id = #{id}
    </select>
    <select id="getModelId" resultType="java.lang.Long">
        select pm.id
        from product_model pm
        left join product p on pm.product_id=p.id
        where pm.model=#{model}
          and  p.product_name=#{productName}
    </select>
</mapper>