Merge branch 'dev_新疆马铃薯pro' of http://114.132.189.42:9002/r/product-invento...

huminmin

2026-06-01 0c9ee949b6a7ea8ce2bbc42cbbd2c64fb977e509

 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">