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

zss

8 天以前 bd1c98db3e0de80c06a53d3302781c2b0b50a3da

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

@@ -62,6 +62,12 @@
            <if test="c.entryDateEnd != null and c.entryDateEnd != ''">
                AND pl.entry_date &lt;= #{c.entryDateEnd}
            </if>
            <if test="c.supplierId != null">
                AND pl.supplier_id = #{c.supplierId}
            </if>
            <if test="c.approvalStatus != null">
                AND pl.approval_status = #{c.approvalStatus}
            </if>
        </where>
        ORDER BY pl.entry_date DESC
    </select>