Merge branch 'dev_New_pro' into dev_宁夏_英泽防锈

云

2026-06-03 66c6ab9883ecb5e0595f02fec6b66e962d1fbf67

 src/main/resources/mapper/stock/StockInventoryMapper.xml

@@ -222,6 +222,7 @@
        unit,
        product_name,
        product_id
        order by combined.create_time desc
    </select>

    <select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
@@ -367,6 +368,7 @@
                and sir.create_time &lt;= #{ew.endMonth}
            </if>
        </where>
        order by sir.id desc
    </select>

    <select id="stockInAndOutRecord" resultType="com.ruoyi.stock.dto.StockInventoryDto">