Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

云

5 天以前 66c6ab9883ecb5e0595f02fec6b66e962d1fbf67

 src/main/resources/mapper/purchase/PurchaseLedgerMapper.xml

@@ -120,6 +120,12 @@
                <if test="c.supplierId != null">
                    AND pl.supplier_id = #{c.supplierId}
                </if>
                <if test="c.ids != null and c.ids.size() > 0">
                    AND pl.id IN
                    <foreach collection="c.ids" item="id" open="(" separator="," close=")">
                        #{id}
                    </foreach>
                </if>
                <if test="c.approvalStatus != null">
                    AND pl.approval_status = #{c.approvalStatus}
                </if>