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

liding

11 小时以前 820e9e9e5e4ce7e8fb477ae8f2573dab1f2074de

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