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

云

2 天以前 23c8604bc54ba3f20b0bf00a2649895c8e096a05

 src/main/resources/mapper/warehouse/DocumentationBorrowManagementMapper.xml

@@ -51,6 +51,7 @@
        <if test="documentationBorrowManagement.entryDateEnd != null and documentationBorrowManagement.entryDateEnd != ''">
            and borrow_date &lt;= DATE_FORMAT(#{documentationBorrowManagement.entryDateEnd},'%Y-%m-%d')
        </if>
        order by dbm.create_time desc
    </select>
    <select id="export" resultType="com.ruoyi.warehouse.dto.DocumentationBorrowManagementDto">
        select dbm.*,doc.doc_name