Merge remote-tracking branch 'origin/dev_tide_cbsglxt' into dev_tide_cbsglx...

zouyu

昨天 02f6d9e4d4f18060c41a7ea891c4c20adf92f335

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

@@ -44,6 +44,9 @@
            <if test="c.entryDateEnd != null and c.entryDateEnd != '' ">
                AND  pl.entry_date &lt;= DATE_FORMAT(#{c.entryDateEnd},'%Y-%m-%d')
            </if>
            <if test="c.recorderId != null and c.recorderId != '' ">
                AND  pl.recorder_id = #{c.recorderId}
            </if>
        </where>
        group by pl.id, pl.purchase_contract_number, pl.sales_contract_no, pl.supplier_name,
        pl.project_name,pl.entry_date,