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

yyb

2026-06-02 c8db0d9987935b82c4a8ca97ce6aaafd19c1f707

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

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

    <select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">