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

liyong

2 天以前 d0a20f29f07dc24c1fc0b27b8572b24a083d8c0d

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

@@ -48,6 +48,9 @@
            <if test="c.status != null and c.status != ''">
                and ppm.status = #{c.status}
            </if>
            <if test="c.auditStatus != null">
                and ppm.audit_status = #{c.auditStatus}
            </if>
        </where>
        order by ppm.id