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

云

7 天以前 8c0d4b8f762b1e1535379c604fdc8e2530dc6c8a

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

@@ -28,6 +28,7 @@
        <if test="documentationReturnManagement.entryDateEnd != null and documentationReturnManagement.entryDateEnd != ''">
            and return_date &lt;= DATE_FORMAT(#{documentationReturnManagement.entryDateEnd},'%Y-%m-%d')
        </if>
        order by dbm.create_time desc
    </select>

    <select id="exportrevent" resultType="com.ruoyi.warehouse.dto.ReturnExportDto">